[jboss-cvs] JBoss Messaging SVN: r3943 - projects/network-benchmark/src/network.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2008-03-26 04:21:33 -0400 (Wed, 26 Mar 2008)
New Revision: 3943

Modified:
   projects/network-benchmark/src/network/BIOServer.java
   projects/network-benchmark/src/network/MINAServer.java
   projects/network-benchmark/src/network/NIOServer.java
Log:
* added server type when printing out a new client log

Modified: projects/network-benchmark/src/network/BIOServer.java
===================================================================
--- projects/network-benchmark/src/network/BIOServer.java	2008-03-26 04:30:32 UTC (rev 3942)
+++ projects/network-benchmark/src/network/BIOServer.java	2008-03-26 08:21:33 UTC (rev 3943)
@@ -82,7 +82,7 @@
                bufferSize = s.getReceiveBufferSize();
             }
             byte[] bytes = new byte[bufferSize];
-            System.out.println("new client...");
+            System.out.println("new client for BIOServer...");
             OutputStream os = s.getOutputStream();
             InputStream is = s.getInputStream();
 

Modified: projects/network-benchmark/src/network/MINAServer.java
===================================================================
--- projects/network-benchmark/src/network/MINAServer.java	2008-03-26 04:30:32 UTC (rev 3942)
+++ projects/network-benchmark/src/network/MINAServer.java	2008-03-26 08:21:33 UTC (rev 3943)
@@ -8,6 +8,7 @@
 import org.apache.mina.common.IoHandlerAdapter;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.transport.socket.SocketAcceptor;
+import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 
 public abstract class MINAServer implements Runnable
 {
@@ -47,7 +48,10 @@
          @Override
          public void sessionOpened(IoSession session) throws Exception
          {
-            System.out.println("new client...");
+            if (server instanceof NioSocketAcceptor)
+               System.out.println("new client for MINANIOServer...");
+            else 
+               System.out.println("new client for MINAAPRServer...");
          }
 
          @Override

Modified: projects/network-benchmark/src/network/NIOServer.java
===================================================================
--- projects/network-benchmark/src/network/NIOServer.java	2008-03-26 04:30:32 UTC (rev 3942)
+++ projects/network-benchmark/src/network/NIOServer.java	2008-03-26 08:21:33 UTC (rev 3943)
@@ -75,7 +75,7 @@
                if (TCP_BUFFER_SIZE != -1) {
                   socket.socket().setSendBufferSize(TCP_BUFFER_SIZE);
                }
-               System.out.println("new client...");
+               System.out.println("new client for NIOServer...");
                socket.configureBlocking(false);
                SelectionKey clientKey = socket.register(selector, SelectionKey.OP_READ);
                clientKey.attach(new Context(socket));