jruby · Jun 4, 2016 · Jun 28, 2016
Showing with 14 additions and 30 deletions.

+0 −8 core/src/main/java/org/jruby/RubyThread.java

+1 −20 core/src/main/java/org/jruby/util/io/SelectExecutor.java

+13 −2 core/src/main/java/org/jruby/util/io/SelectorPool.java
diff --git a/core/src/main/java/org/jruby/RubyThread.java b/core/src/main/java/org/jruby/RubyThread.java
@@ -1768,14 +1768,6 @@ public boolean select(Channel channel, OpenFile fptr, int ops, long timeout) {
                     // so that we can ensure one failing does not affect the others
                     // running.
 
-                    // clean up the key in the selector
-                    try {
-                        if (key != null) key.cancel();
-                        if (currentSelector != null) currentSelector.selectNow();
-                    } catch (Exception e) {
-                        // ignore
-                    }
-
                     // shut down and null out the selector
                     try {
                         if (currentSelector != null) {

diff --git a/core/src/main/java/org/jruby/util/io/SelectExecutor.java b/core/src/main/java/org/jruby/util/io/SelectExecutor.java
@@ -50,17 +50,12 @@ IRubyObject selectCall(ThreadContext context) throws IOException {
     }
 
     IRubyObject selectEnd(ThreadContext context) throws IOException {
-        fdTerm(readKeyList);
-        fdTerm(writeKeyList);
-        fdTerm(errorKeyList);
-
         if (selectors != null) {
             for (int i = 0; i < selectors.size(); i++) {
                 Selector selector = selectors.get(i);
                 // if it is a JDK selector, cache it
                 if (selector.provider() == SelectorProvider.provider()) {
-                    // clear cancelled keys (with selectNow) and return to pool
-                    selector.selectNow();
+                    // return to pool
                     context.runtime.getSelectorPool().put(selector);
                 } else {
                     selector.close();
@@ -277,20 +272,6 @@ private boolean fdIsSet(List<SelectionKey> fds, ChannelFD fd, int operations) {
         return false;
     }
 
-    private void fdTerm(List<SelectionKey> keys) {
-        if (keys == null) return;
-        for (int i = 0; i < keys.size(); i++) {
-            SelectionKey key = keys.get(i);
-            killKey(key);
-        }
-    }
-
-    private void killKey(SelectionKey key) {
-        try {
-            if (key.isValid()) key.cancel();
-        } catch (Exception e) {}
-    }
-
     private SelectionKey trySelectRead(ThreadContext context, ChannelFD fd) throws IOException {
         if (fd.chSelect != null) {
             return registerSelect(getSelector(context, fd.chSelect), fd, fd.chSelect, READ_ACCEPT_OPS);

diff --git a/core/src/main/java/org/jruby/util/io/SelectorPool.java b/core/src/main/java/org/jruby/util/io/SelectorPool.java
@@ -30,6 +30,7 @@
 package org.jruby.util.io;
 
 import java.io.IOException;
+import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,6 +39,7 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
+import java.util.Iterator;
 
 /**
  * This is a simple implementation of a hard-referenced java.nio.channels.Selector
@@ -82,7 +84,16 @@ public synchronized Selector get(SelectorProvider provider) throws IOException{
      *
      * @param selector the selector to put back
      */
-    public synchronized void put(Selector selector) {
+    public void put(Selector selector) {
+        Iterator<SelectionKey> key_iterator = selector.keys().iterator();
+        while(key_iterator.hasNext()) key_iterator.next().cancel();
+
+        try {
+            selector.selectNow();
+        } catch (Exception e) {
+            //ignore
+        }
+
         returnToPool(selector);
     }
 
@@ -130,7 +141,7 @@ private Selector retrieveFromPool(SelectorProvider provider) throws IOException
         return selector;
     }
 
-    private void returnToPool(Selector selector) {
+    private synchronized void returnToPool(Selector selector) {
         openSelectors.remove(selector);
         if (selector.isOpen()) {
             SelectorProvider provider = selector.provider();