Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1a8a43a283ba
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3cb502178cd0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 21, 2016

  1. Copy the full SHA
    1c4a73b View commit details
  2. [Truffle] Fix RbConfig.ruby.

    * There was a trailing "/".
    eregon committed Nov 21, 2016
    Copy the full SHA
    3cb5021 View commit details
Showing with 9 additions and 8 deletions.
  1. +7 −7 truffle/src/main/java/org/jruby/truffle/core/VMPrimitiveNodes.java
  2. +2 −1 truffle/src/main/ruby/core/rbconfig.rb
Original file line number Diff line number Diff line change
@@ -550,20 +550,20 @@ public Object waitPID(int input_pid, boolean no_hang) {

final int finalOptions = options;

// retry:
pid = getContext().getThreadManager().runUntilResult(this, () -> posix().waitpid(input_pid, statusReference, finalOptions));
pid = getContext().getThreadManager().runUntilResult(this, () -> {
int result = posix().waitpid(input_pid, statusReference, finalOptions);
if (result == -1 && posix().errno() == EINTR.intValue()) {
throw new InterruptedException();
}
return result;
});

final int errno = posix().errno();

if (pid == -1) {
if (errno == ECHILD.intValue()) {
return false;
}
if (errno == EINTR.intValue()) {
throw new UnsupportedOperationException();
//if(!state->check_async(calling_environment)) return NULL;
//goto retry;
}

// TODO handle other errnos?
return false;
3 changes: 2 additions & 1 deletion truffle/src/main/ruby/core/rbconfig.rb
Original file line number Diff line number Diff line change
@@ -117,7 +117,8 @@ module RbConfig

def self.ruby
# TODO (eregon, 30 Sep 2016): should be the one used by the launcher!
File.join CONFIG['bindir'], CONFIG['ruby_install_name'], CONFIG['exeext']
jruby_truffle = CONFIG['ruby_install_name'] + CONFIG['exeext']
File.join CONFIG['bindir'], jruby_truffle
end

def RbConfig::expand(val, config = CONFIG)