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

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

Author: jmesnil
Date: 2008-03-20 09:18:54 -0400 (Thu, 20 Mar 2008)
New Revision: 3895

Modified:
   projects/network-benchmark/src/network/BIOServer.java
   projects/network-benchmark/src/network/MINAServer.java
   projects/network-benchmark/src/network/NIOServer.java
   projects/network-benchmark/src/network/NetworkClientTest.java
Log:
* if TCP_BUFFER_SIZE is set ( != -1), set explicitely the TCP send & receive buffer sizes on the clients & servers with the specified value

Modified: projects/network-benchmark/src/network/BIOServer.java
===================================================================
--- projects/network-benchmark/src/network/BIOServer.java	2008-03-20 08:41:15 UTC (rev 3894)
+++ projects/network-benchmark/src/network/BIOServer.java	2008-03-20 13:18:54 UTC (rev 3895)
@@ -19,7 +19,8 @@
    public static void main(String[] args) throws Exception
    {
       ServerSocket serverSocket = new ServerSocket();
-      serverSocket.setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+      if (NetworkClientTest.TCP_BUFFER_SIZE != -1)
+         serverSocket.setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
       serverSocket.bind(NetworkClientTest.BIO_ADDRESS);
       System.out
             .println("BIO Server bound to " + NetworkClientTest.BIO_ADDRESS);
@@ -29,7 +30,8 @@
       while (true)
       {
          Socket clientSocket = serverSocket.accept();
-         clientSocket.setSendBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+         if (NetworkClientTest.TCP_BUFFER_SIZE != -1)
+            clientSocket.setSendBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
          System.out.println("new client...");
          OutputStream os = clientSocket.getOutputStream();
 

Modified: projects/network-benchmark/src/network/MINAServer.java
===================================================================
--- projects/network-benchmark/src/network/MINAServer.java	2008-03-20 08:41:15 UTC (rev 3894)
+++ projects/network-benchmark/src/network/MINAServer.java	2008-03-20 13:18:54 UTC (rev 3895)
@@ -19,8 +19,11 @@
    public static void main(String[] args) throws Exception
    {
       final NioSocketAcceptor server = new NioSocketAcceptor();
-      server.getSessionConfig().setSendBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
-      server.getSessionConfig().setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+      if (NetworkClientTest.TCP_BUFFER_SIZE != -1)
+      {
+         server.getSessionConfig().setSendBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+         server.getSessionConfig().setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+      }
       server.setCloseOnDeactivation(false);
       server.setHandler(new IoHandlerAdapter()
       {

Modified: projects/network-benchmark/src/network/NIOServer.java
===================================================================
--- projects/network-benchmark/src/network/NIOServer.java	2008-03-20 08:41:15 UTC (rev 3894)
+++ projects/network-benchmark/src/network/NIOServer.java	2008-03-20 13:18:54 UTC (rev 3895)
@@ -23,7 +23,8 @@
    {
       ServerSocketChannel server = ServerSocketChannel.open();
       server.configureBlocking(false);
-      server.socket().setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+      if (NetworkClientTest.TCP_BUFFER_SIZE != -1)
+         server.socket().setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
       server.socket().bind(NetworkClientTest.NIO_ADDRESS);
 
       System.out
@@ -57,7 +58,8 @@
 
                // Accept request
                SocketChannel socket = keyChannel.accept();
-               socket.socket().setSendBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
+               if (NetworkClientTest.TCP_BUFFER_SIZE != -1)
+                  socket.socket().setSendBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
                System.out.println("new client...");
                socket.configureBlocking(false);
                socket.register(selector, SelectionKey.OP_READ);

Modified: projects/network-benchmark/src/network/NetworkClientTest.java
===================================================================
--- projects/network-benchmark/src/network/NetworkClientTest.java	2008-03-20 08:41:15 UTC (rev 3894)
+++ projects/network-benchmark/src/network/NetworkClientTest.java	2008-03-20 13:18:54 UTC (rev 3895)
@@ -50,13 +50,15 @@
       System.out.println("TCP no delay: " + ENABLE_TCP_NO_DELAY);
       try
       {
-         System.out.println("TCP buffer size: " + TCP_BUFFER_SIZE
-               + " (default hint: " + (new Socket()).getSendBufferSize()
-               + ")\n");
+         System.out.println("TCP send buffer size: " + TCP_BUFFER_SIZE
+               + " (default hint: " + (new Socket()).getSendBufferSize());
+         System.out.println("TCP receive buffer size: " + TCP_BUFFER_SIZE
+               + " (default hint: " + (new Socket()).getReceiveBufferSize());
       } catch (SocketException e)
       {
          e.printStackTrace();
       }
+      System.out.println();
    }
 
    // Constructors --------------------------------------------------
@@ -157,7 +159,10 @@
       clientSocket.setReuseAddress(false);
       clientSocket.setTcpNoDelay(ENABLE_TCP_NO_DELAY);
       if (TCP_BUFFER_SIZE != -1)
+      {
          clientSocket.setSendBufferSize(TCP_BUFFER_SIZE);
+         clientSocket.setReceiveBufferSize(TCP_BUFFER_SIZE);
+      }
       clientSocket.connect(address);
       OutputStream os = clientSocket.getOutputStream();
       InputStream is = clientSocket.getInputStream();
@@ -189,7 +194,10 @@
       clientSocket.setReuseAddress(false);
       clientSocket.setTcpNoDelay(ENABLE_TCP_NO_DELAY);
       if (TCP_BUFFER_SIZE != -1)
+      {
          clientSocket.setSendBufferSize(TCP_BUFFER_SIZE);
+         clientSocket.setReceiveBufferSize(TCP_BUFFER_SIZE);
+      }
       clientSocket.connect(address);
       OutputStream os = clientSocket.getOutputStream();
       final InputStream is = clientSocket.getInputStream();
@@ -248,7 +256,10 @@
       NioSocketConnector client = new NioSocketConnector();
       client.getSessionConfig().setTcpNoDelay(ENABLE_TCP_NO_DELAY);
       if (TCP_BUFFER_SIZE != -1)
+      {
          client.getSessionConfig().setSendBufferSize(TCP_BUFFER_SIZE);
+         client.getSessionConfig().setReceiveBufferSize(TCP_BUFFER_SIZE);
+      }
       client.getSessionConfig().setReuseAddress(false);
       client.getSessionConfig().setUseReadOperation(true);
 
@@ -291,7 +302,10 @@
       NioSocketConnector client = new NioSocketConnector();
       client.getSessionConfig().setTcpNoDelay(ENABLE_TCP_NO_DELAY);
       if (TCP_BUFFER_SIZE != -1)
+      {
          client.getSessionConfig().setSendBufferSize(TCP_BUFFER_SIZE);
+         client.getSessionConfig().setReceiveBufferSize(TCP_BUFFER_SIZE);
+      }
       client.getSessionConfig().setReuseAddress(false);
       client.getSessionConfig().setUseReadOperation(true);