From 97af3632a16abfcce27c68dae9bf41ab87505084 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@intalio.com>
Date: Wed, 17 Dec 2014 17:03:15 +0100
Subject: [PATCH] SelectManager executes endpoint tasks

---
 .../org/eclipse/jetty/io/ManagedSelector.java   |  6 ++++--
 .../eclipse/jetty/io/SelectChannelEndPoint.java | 17 +++++++++++------
 .../org/eclipse/jetty/io/SelectorManager.java   |  2 +-
 .../org/eclipse/jetty/io/SslConnectionTest.java |  3 +--
 .../jetty/server/ExtendedServerTest.java        |  4 ++--
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
index d590a49472b..fbaea62b868 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
@@ -325,12 +325,14 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
 
     private void processKey(SelectionKey key)
     {
-        Object attachment = key.attachment();
+        final Object attachment = key.attachment();
         try
         {
             if (attachment instanceof SelectableEndPoint)
             {
-                ((SelectableEndPoint)attachment).onSelected();
+                Runnable task=((SelectableEndPoint)attachment).onSelected();
+                if (task!=null)
+                    _selectorManager.getExecutor().execute(task);
             }
             else if (key.isConnectable())
             {
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
index e00a026ab16..3af3082467c 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
@@ -53,6 +53,9 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa
     private int _interestOps;
     
     private final Runnable _runUpdateKey = new Runnable() { public void run() { updateKey(); } };
+    private final Runnable _runFillable = new Runnable() { public void run() { getFillInterest().fillable(); } };
+    private final Runnable _runCompleteWrite = new Runnable() { public void run() { getWriteFlusher().completeWrite(); } };
+    private final Runnable _runFillableCompleteWrite = new Runnable() { public void run() {  getFillInterest().fillable(); getWriteFlusher().completeWrite(); } };
 
     public SelectChannelEndPoint(SocketChannel channel, ManagedSelector selector, SelectionKey key, Scheduler scheduler, long idleTimeout)
     {
@@ -76,14 +79,12 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa
     }
 
     @Override
-    public void onSelected()
+    public Runnable onSelected()
     {
         /**
          * This method may run concurrently with {@link #changeInterests(int)}.
          */
 
-        assert _selector.isSelectorThread();
-
         while (true)
         {
             State current = _interestState.get();
@@ -117,11 +118,15 @@ public class SelectChannelEndPoint extends ChannelEndPoint implements SelectorMa
                     }
                     
                     if ((readyOps & SelectionKey.OP_READ) != 0)
-                        getFillInterest().fillable();
+                    {
+                        if ((readyOps & SelectionKey.OP_WRITE) != 0)
+                            return _runFillableCompleteWrite;
+                        return _runFillable;
+                    }
                     if ((readyOps & SelectionKey.OP_WRITE) != 0)
-                        getWriteFlusher().completeWrite();
+                        return _runCompleteWrite;
 
-                    return;
+                    return null;
                 }
                 case LOCKED:
                 {
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
index 9459a9f9bc8..a3510114678 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/SelectorManager.java
@@ -394,7 +394,7 @@ public abstract class SelectorManager extends AbstractLifeCycle implements Dumpa
          * Callback method invoked when a read or write events has been
          * detected by the {@link ManagedSelector} for this endpoint.
          */
-        void onSelected();
+        Runnable onSelected();
 
         /**
          * Callback method invoked when all the keys selected by the
diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
index bf38965e260..fc3b0e88b17 100644
--- a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
+++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
@@ -276,7 +276,6 @@ public class SslConnectionTest
         len=5;
         while(len>0)
             len-=client.getInputStream().read(buffer);
-        Assert.assertEquals(1, _dispatches.get());
 
         client.close();
     }
@@ -308,7 +307,7 @@ public class SslConnectionTest
     public void testBlockedWrite() throws Exception
     {
         Socket client = newClient();
-        client.setSoTimeout(60000);
+        client.setSoTimeout(5000);
 
         SocketChannel server = _connector.accept();
         server.configureBlocking(false);
diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java
index 33a28d9ebfc..a7e208e6c95 100644
--- a/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java
+++ b/jetty-server/src/test/java/org/eclipse/jetty/server/ExtendedServerTest.java
@@ -78,10 +78,10 @@ public class ExtendedServerTest extends HttpServerTestBase
         }
 
         @Override
-        public void onSelected()
+        public Runnable onSelected()
         {
             _lastSelected=System.currentTimeMillis();
-            super.onSelected();
+            return super.onSelected();
         }
 
         long getLastSelected()