Optimize timeout handling, thanks to a suggestion from Jeanfrancois.Arcand@Sun.COM,

although this does put a gap in the timeout check, even in those cases where there shouldn't be, ie, a socket can be closed immediately

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@421791 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/http11/InternalNioInputBuffer.java b/java/org/apache/coyote/http11/InternalNioInputBuffer.java
index d8765c3..76f26dd 100644 (file)
--- a/java/org/apache/coyote/http11/InternalNioInputBuffer.java
+++ b/java/org/apache/coyote/http11/InternalNioInputBuffer.java
@@ -572,21 +572,7 @@ public class InternalNioInputBuffer implements InputBuffer {
                     boolean addToQueue = false;\r
                     try { addToQueue = ((key.interestOps()&SelectionKey.OP_READ) != SelectionKey.OP_READ); } catch ( CancelledKeyException ignore ){}\r
                     if ( addToQueue ) {\r
-                        att.setWakeUp(true);\r
-                        poller.addEvent(\r
-                            new Runnable() {\r
-                            public void run() {\r
-                                try {\r
-                                    if (key != null) key.interestOps(SelectionKey.OP_READ);\r
-                                } catch (CancelledKeyException ckx) {\r
-                                    try {\r
-                                        socket.socket().close();\r
-                                        socket.close();\r
-                                        att.setWakeUp(false);\r
-                                    } catch (Exception ignore) {}\r
-                                }\r
-                            }\r
-                        });\r
+                        addToReadQueue(key, att);\r
                     }//end if\r
                     synchronized (att.getMutex()) {\r
                         if ( att.getWakeUp() ) att.getMutex().wait(25);\r
@@ -598,6 +584,28 @@ public class InternalNioInputBuffer implements InputBuffer {
         throw new IOException("read timed out.");\r
     }\r
 \r
+    private void addToReadQueue(final SelectionKey key, final KeyAttachment att) {\r
+        att.setWakeUp(true);\r
+        poller.addEvent(\r
+            new Runnable() {\r
+            public void run() {\r
+                try {\r
+                    if (key != null) key.interestOps(SelectionKey.OP_READ);\r
+                } catch (CancelledKeyException ckx) {\r
+                    try {\r
+                        if ( key != null && key.attachment() != null ) {\r
+                            KeyAttachment ka = (KeyAttachment)key.attachment();\r
+                            ka.setError(true); //set to collect this socket immediately\r
+                        }\r
+                        socket.socket().close();\r
+                        socket.close();\r
+                        att.setWakeUp(false);\r
+                    } catch (Exception ignore) {}\r
+                }\r
+            }\r
+        });\r
+    }\r
+\r
 \r
     /**\r
      * Parse the HTTP headers.\r

diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java
index 64c4f4b..8301cbd 100644 (file)
--- a/java/org/apache/tomcat/util/net/NioEndpoint.java
+++ b/java/org/apache/tomcat/util/net/NioEndpoint.java
@@ -967,6 +967,7 @@ public class NioEndpoint {
         protected Selector selector;\r
         protected LinkedList<Runnable> events = new LinkedList<Runnable>();\r
         protected boolean close = false;\r
+        protected long nextExpiration = 0;//optimize expiration handling\r
 \r
         protected int keepAliveCount = 0;\r
         public int getKeepAliveCount() { return keepAliveCount; }\r
@@ -1029,6 +1030,10 @@ public class NioEndpoint {
                         if (key != null) key.interestOps(SelectionKey.OP_READ);\r
                     }catch ( CancelledKeyException ckx ) {\r
                         try {\r
+                            if ( key != null && key.attachment() != null ) {\r
+                                KeyAttachment ka = (KeyAttachment)key.attachment();\r
+                                ka.setError(true); //set to collect this socket immediately\r
+                            }\r
                             socket.socket().close();\r
                             socket.close();\r
                         } catch ( Exception ignore ) {}\r
@@ -1075,7 +1080,7 @@ public class NioEndpoint {
             try {\r
                 KeyAttachment ka = (KeyAttachment) key.attachment();\r
                 key.cancel();\r
-                if (ka.getComet()) processSocket( (SocketChannel) key.channel(), true);\r
+                if (ka != null && ka.getComet()) processSocket( (SocketChannel) key.channel(), true);\r
                 key.channel().close();\r
             } catch (IOException e) {\r
                 if ( log.isDebugEnabled() ) log.debug("",e);\r
@@ -1156,34 +1161,45 @@ public class NioEndpoint {
                         log.error("",t);\r
                     }\r
                 }//while\r
-\r
-                //timeout\r
-                Set<SelectionKey> keys = selector.keys();\r
-                long now = System.currentTimeMillis();\r
-                for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext(); ) {\r
-                    SelectionKey key = iter.next();\r
-                    try {\r
-                        if (key.interestOps() == SelectionKey.OP_READ) {\r
-                            //only timeout sockets that we are waiting for a read from\r
-                            KeyAttachment ka = (KeyAttachment) key.attachment();\r
-                            long delta = now - ka.getLastAccess();\r
-                            boolean isTimedout = (ka.getTimeout()==-1)?(delta > (long) soTimeout):(delta>ka.getTimeout());\r
-                            if (isTimedout) {\r
-                                cancelledKey(key);\r
-                            }\r
-                        }\r
-                    }catch ( CancelledKeyException ckx ) {\r
-                        cancelledKey(key);\r
-                    }\r
-                }\r
-\r
+                //process timeouts\r
+                timeout();\r
             }\r
             synchronized (this) {\r
                 this.notifyAll();\r
             }\r
 \r
         }\r
-\r
+        protected void timeout() {\r
+            long now = System.currentTimeMillis();\r
+            if ( now < nextExpiration ) return;\r
+            nextExpiration = now + (long)soTimeout;\r
+            //timeout\r
+            Set<SelectionKey> keys = selector.keys();\r
+            for (Iterator<SelectionKey> iter = keys.iterator(); iter.hasNext(); ) {\r
+                SelectionKey key = iter.next();\r
+                try {\r
+                    KeyAttachment ka = (KeyAttachment) key.attachment();\r
+                    if ( ka == null ) {\r
+                        cancelledKey(key); //we don't support any keys without attachments\r
+                    } else if ( ka.getError() ) {\r
+                        cancelledKey(key);\r
+                    }else if ((key.interestOps()&SelectionKey.OP_READ) == SelectionKey.OP_READ) {\r
+                        //only timeout sockets that we are waiting for a read from\r
+                        long delta = now - ka.getLastAccess();\r
+                        long timeout = (ka.getTimeout()==-1)?((long) soTimeout):(ka.getTimeout());\r
+                        boolean isTimedout = delta > timeout;\r
+                        if (isTimedout) {\r
+                            cancelledKey(key);\r
+                        } else {\r
+                            long nextTime = now+(timeout-delta);\r
+                            nextExpiration = (nextTime < nextExpiration)?nextTime:nextExpiration;\r
+                        }\r
+                    }//end if\r
+                }catch ( CancelledKeyException ckx ) {\r
+                    cancelledKey(key);\r
+                }\r
+            }//for\r
+        }\r
     }\r
     \r
     public static class KeyAttachment {\r
@@ -1200,12 +1216,15 @@ public class NioEndpoint {
         public Object getMutex() {return mutex;}\r
         public void setTimeout(long timeout) {this.timeout = timeout;}\r
         public long getTimeout() {return this.timeout;}\r
+        public boolean getError() { return error; }\r
+        public void setError(boolean error) { this.error = error; }\r
         protected Object mutex = new Object();\r
         protected boolean wakeUp = false;\r
         protected long lastAccess = System.currentTimeMillis();\r
         protected boolean currentAccess = false;\r
         protected boolean comet = false;\r
         protected long timeout = -1;\r
+        protected boolean error = false;\r
 \r
     }\r
 \r