jruby · Oct 7, 2016 · Oct 7, 2016
Showing with 5 additions and 4 deletions.

+0 −1 spec/truffle/tags/core/process/getpriority_tags.txt

+4 −0 truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java

+1 −1 truffle/src/main/ruby/core/exception.rb

+0 −2 truffle/src/main/ruby/core/process.rb
diff --git a/spec/truffle/tags/core/process/getpriority_tags.txt b/spec/truffle/tags/core/process/getpriority_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java b/truffle/src/main/java/org/jruby/truffle/platform/posix/JNRTrufflePosix.java
@@ -144,6 +144,10 @@ public int getppid() {
 
     @Override
     public int getpriority(int which, int who) {
+        // getpriority can return -1 so errno has to be cleared.
+        // it should be done as close as possible to the syscall
+        // as JVM classloading could change errno.
+        posix.errno(0);
         return posix.getpriority(which, who);
     }
 

diff --git a/truffle/src/main/ruby/core/exception.rb b/truffle/src/main/ruby/core/exception.rb
@@ -304,7 +304,7 @@ def self.errno_error(message, errno, location)
   end
 
   # We use .new here because when errno is set, we attempt to
-  # lookup and return a subclass of SystemCallError, specificly,
+  # lookup and return a subclass of SystemCallError, specifically,
   # one of the Errno subclasses.
   def self.new(*args)
     # This method is used 2 completely different ways. One is when it's called

diff --git a/truffle/src/main/ruby/core/process.rb b/truffle/src/main/ruby/core/process.rb
@@ -354,8 +354,6 @@ def self.getpriority(kind, id)
     kind = Rubinius::Type.coerce_to kind, Integer, :to_int
     id =   Rubinius::Type.coerce_to id, Integer, :to_int
 
-    Truffle::POSIX.errno = 0
-    Errno.handle # Make sure the reset above worked
     ret = Truffle::POSIX.getpriority(kind, id)
     Errno.handle
     ret