jruby · Oct 14, 2015 · Oct 14, 2015
Showing with 43 additions and 12 deletions.

+1 −4 test/truffle/simple-webrick-server.rb

+8 −2 truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java

+34 −6 truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java
diff --git a/test/truffle/simple-webrick-server.rb b/test/truffle/simple-webrick-server.rb
@@ -1,9 +1,6 @@
 require 'webrick'
 
-root = File.expand_path '~/public_html'
-server = WEBrick::HTTPServer.new :Port => 8080, :DocumentRoot => root
-
-trap 'INT' do server.shutdown end
+server = WEBrick::HTTPServer.new(:Port => 8080)
 
 server.mount_proc '/' do |req, res|
   res.body = "Hello, world!\n"

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
@@ -594,7 +594,7 @@ public Object select(DynamicObject readables, DynamicObject writables, DynamicOb
                 readableSet.set(fd);
             }
 
-            final int result = getContext().getThreadManager().runUntilTimeout(this, timeout, new ThreadManager.BlockingTimeoutAction<Integer>() {
+            final ThreadManager.ResultOrTimeout<Integer> result = getContext().getThreadManager().runUntilTimeout(this, timeout, new ThreadManager.BlockingTimeoutAction<Integer>() {
                 @Override
                 public Integer block(Timeval timeoutToUse) throws InterruptedException {
                     final int result = nativeSockets().select(
@@ -612,7 +612,13 @@ public Integer block(Timeval timeoutToUse) throws InterruptedException {
                 }
             });
 
-            if (result == -1 || result == 0) {
+            if (result instanceof ThreadManager.TimedOut) {
+                return nil();
+            }
+
+            final int resultCode = ((ThreadManager.ResultWithinTime<Integer>) result).getValue();
+
+            if (resultCode == -1 || resultCode == 0) {
                 return nil();
             }
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/ThreadManager.java
@@ -95,30 +95,54 @@ public <T> T runUntilResult(Node currentNode, BlockingAction<T> action) {
         return result;
     }
 
-    public <T> T runUntilTimeout(Node currentNode, int timeout, final BlockingTimeoutAction<T> action) {
+    public interface ResultOrTimeout<T> {
+    }
+
+    public static class ResultWithinTime<T> implements ResultOrTimeout<T> {
+
+        private final T value;
+
+        public ResultWithinTime(T value) {
+            this.value = value;
+        }
+
+        public T getValue() {
+            return value;
+        }
+
+    }
+
+    public static class TimedOut<T> implements ResultOrTimeout<T> {
+    }
+
+    public <T> ResultOrTimeout<T> runUntilTimeout(Node currentNode, int timeout, final BlockingTimeoutAction<T> action) {
         final Timeval timeoutToUse = new DefaultNativeTimeval(jnr.ffi.Runtime.getSystemRuntime());
 
         if (timeout == 0) {
             timeoutToUse.setTime(new long[]{0, 0});
 
-            return runUntilResult(currentNode, new BlockingAction<T>() {
+            return new ResultWithinTime<>(runUntilResult(currentNode, new BlockingAction<T>() {
 
                 @Override
                 public T block() throws InterruptedException {
                     return action.block(timeoutToUse);
                 }
 
-            });
+            }));
         } else {
             final int pollTime = 500_000_000;
             final long requestedTimeoutAt = System.nanoTime() + timeout * 1_000;
 
-            return runUntilResult(currentNode, new BlockingAction<T>() {
+            return runUntilResult(currentNode, new BlockingAction<ResultOrTimeout<T>>() {
 
                 @Override
-                public T block() throws InterruptedException {
+                public ResultOrTimeout<T> block() throws InterruptedException {
                     final long timeUntilRequestedTimeout = requestedTimeoutAt - System.nanoTime();
 
+                    if (timeUntilRequestedTimeout <= 0) {
+                        return new TimedOut<>();
+                    }
+
                     final boolean timeoutForPoll;
                     final long effectiveTimeout;
 
@@ -139,7 +163,11 @@ public T block() throws InterruptedException {
                         throw new InterruptedException();
                     }
 
-                    return result;
+                    if (result == null) {
+                        return new TimedOut<>();
+                    }
+
+                    return new ResultWithinTime<>(result);
                 }
 
             });