Return-Path: Delivered-To: apmail-incubator-geronimo-cvs-archive@www.apache.org Received: (qmail 3479 invoked from network); 24 Apr 2004 17:55:04 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 24 Apr 2004 17:55:04 -0000 Received: (qmail 44222 invoked by uid 500); 24 Apr 2004 17:54:55 -0000 Delivered-To: apmail-incubator-geronimo-cvs-archive@incubator.apache.org Received: (qmail 43995 invoked by uid 500); 24 Apr 2004 17:54:54 -0000 Mailing-List: contact geronimo-cvs-help@incubator.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: geronimo-dev@incubator.apache.org Delivered-To: mailing list geronimo-cvs@incubator.apache.org Received: (qmail 43980 invoked from network); 24 Apr 2004 17:54:54 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 24 Apr 2004 17:54:54 -0000 Received: (qmail 3469 invoked by uid 1724); 24 Apr 2004 17:55:02 -0000 Date: 24 Apr 2004 17:55:02 -0000 Message-ID: <20040424175502.3468.qmail@minotaur.apache.org> From: chirino@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/network/src/java/org/apache/geronimo/network SelectorManager.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N chirino 2004/04/24 10:55:02 Modified: modules/network/src/java/org/apache/geronimo/network SelectorManager.java Log: Better trace logging. Revision Changes Path 1.5 +21 -21 incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java Index: SelectorManager.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/network/src/java/org/apache/geronimo/network/SelectorManager.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SelectorManager.java 3 Apr 2004 00:07:51 -0000 1.4 +++ SelectorManager.java 24 Apr 2004 17:55:02 -0000 1.5 @@ -127,14 +127,15 @@ try { log.debug("Selector Work thread has started."); + log.debug("Selector Manager timeout: "+timeout); while (running) { synchronized (guard) { /* do nothing */ + log.trace("Waiting for selector to return."); } - - log.trace("Waiting for selector to return"); + if (selector.select(timeout) == 0) continue; - + // Get a java.util.Set containing the SelectionKey objects for // all channels that are ready for I/O. Set keys = selector.selectedKeys(); @@ -143,31 +144,30 @@ for (Iterator i = keys.iterator(); i.hasNext();) { final SelectionKey key = (SelectionKey) i.next(); - try { - if (key.isReadable())key.interestOps(key.interestOps() & (~SelectionKey.OP_READ)); - if (key.isWritable())key.interestOps(key.interestOps() & (~SelectionKey.OP_WRITE)); - if (key.isAcceptable())key.interestOps(key.interestOps() & (~SelectionKey.OP_ACCEPT)); - - threadPool.getWorkManager().execute(new Runnable() { - public void run() { - try { - ((SelectionEventListner) key.attachment()).selectionEvent(key); - } catch (Throwable e) { - log.trace("Request Failed.", e); - } + if (key.isReadable())key.interestOps(key.interestOps() & (~SelectionKey.OP_READ)); + if (key.isWritable())key.interestOps(key.interestOps() & (~SelectionKey.OP_WRITE)); + if (key.isAcceptable())key.interestOps(key.interestOps() & (~SelectionKey.OP_ACCEPT)); + + threadPool.getWorkManager().execute(new Runnable() { + public void run() { + try { + ((SelectionEventListner) key.attachment()).selectionEvent(key); + } catch (Throwable e) { + log.trace("Request Failed.", e); } - }); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } + } + }); i.remove(); // Remove the key from the set of selected keys } } } catch (CancelledKeyException e) { + log.debug("Key has Been Cancelled: "+e); } catch (IOException e) { log.warn("IOException occured.", e); - } finally { + } catch (InterruptedException e) { + log.debug("Selector Work thread has been interrupted."); + } finally { log.debug("Selector Work thread has stopped."); } }