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

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

Author: jmesnil
Date: 2008-03-20 04:41:15 -0400 (Thu, 20 Mar 2008)
New Revision: 3894

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:
* set TCP send & receive buffer size on the servers too

Modified: projects/network-benchmark/src/network/BIOServer.java
===================================================================
--- projects/network-benchmark/src/network/BIOServer.java	2008-03-19 13:27:45 UTC (rev 3893)
+++ projects/network-benchmark/src/network/BIOServer.java	2008-03-20 08:41:15 UTC (rev 3894)
@@ -19,8 +19,8 @@
    public static void main(String[] args) throws Exception
    {
       ServerSocket serverSocket = new ServerSocket();
+      serverSocket.setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
       serverSocket.bind(NetworkClientTest.BIO_ADDRESS);
-
       System.out
             .println("BIO Server bound to " + NetworkClientTest.BIO_ADDRESS);
 
@@ -29,6 +29,7 @@
       while (true)
       {
          Socket clientSocket = serverSocket.accept();
+         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-19 13:27:45 UTC (rev 3893)
+++ projects/network-benchmark/src/network/MINAServer.java	2008-03-20 08:41:15 UTC (rev 3894)
@@ -19,6 +19,8 @@
    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);
       server.setCloseOnDeactivation(false);
       server.setHandler(new IoHandlerAdapter()
       {

Modified: projects/network-benchmark/src/network/NIOServer.java
===================================================================
--- projects/network-benchmark/src/network/NIOServer.java	2008-03-19 13:27:45 UTC (rev 3893)
+++ projects/network-benchmark/src/network/NIOServer.java	2008-03-20 08:41:15 UTC (rev 3894)
@@ -23,6 +23,7 @@
    {
       ServerSocketChannel server = ServerSocketChannel.open();
       server.configureBlocking(false);
+      server.socket().setReceiveBufferSize(NetworkClientTest.TCP_BUFFER_SIZE);
       server.socket().bind(NetworkClientTest.NIO_ADDRESS);
 
       System.out
@@ -56,6 +57,7 @@
 
                // Accept request
                SocketChannel socket = keyChannel.accept();
+               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-19 13:27:45 UTC (rev 3893)
+++ projects/network-benchmark/src/network/NetworkClientTest.java	2008-03-20 08:41:15 UTC (rev 3894)
@@ -27,9 +27,9 @@
    // Configurable properties:
    private static final String SERVER_HOST = "192.168.0.4";
    private static final long DURATION = 10000; // in ms
-   public static final int MESSAGE_SIZE = 256; // in bytes
+   public static final int MESSAGE_SIZE = 1024; // in bytes
    private static final boolean ENABLE_TCP_NO_DELAY = false;
-   private static final int TCP_SEND_BUFFER_SIZE = -1; // -1 to not set it
+   static final int TCP_BUFFER_SIZE = -1; // -1 to not set it
 
    // Constants -----------------------------------------------------
 
@@ -50,7 +50,7 @@
       System.out.println("TCP no delay: " + ENABLE_TCP_NO_DELAY);
       try
       {
-         System.out.println("TCP send buffer size: " + TCP_SEND_BUFFER_SIZE
+         System.out.println("TCP buffer size: " + TCP_BUFFER_SIZE
                + " (default hint: " + (new Socket()).getSendBufferSize()
                + ")\n");
       } catch (SocketException e)
@@ -156,8 +156,8 @@
       Socket clientSocket = new Socket();
       clientSocket.setReuseAddress(false);
       clientSocket.setTcpNoDelay(ENABLE_TCP_NO_DELAY);
-      if (TCP_SEND_BUFFER_SIZE != -1)
-         clientSocket.setSendBufferSize(TCP_SEND_BUFFER_SIZE);
+      if (TCP_BUFFER_SIZE != -1)
+         clientSocket.setSendBufferSize(TCP_BUFFER_SIZE);
       clientSocket.connect(address);
       OutputStream os = clientSocket.getOutputStream();
       InputStream is = clientSocket.getInputStream();
@@ -188,8 +188,8 @@
       final Socket clientSocket = new Socket();
       clientSocket.setReuseAddress(false);
       clientSocket.setTcpNoDelay(ENABLE_TCP_NO_DELAY);
-      if (TCP_SEND_BUFFER_SIZE != -1)
-         clientSocket.setSendBufferSize(TCP_SEND_BUFFER_SIZE);
+      if (TCP_BUFFER_SIZE != -1)
+         clientSocket.setSendBufferSize(TCP_BUFFER_SIZE);
       clientSocket.connect(address);
       OutputStream os = clientSocket.getOutputStream();
       final InputStream is = clientSocket.getInputStream();
@@ -247,8 +247,8 @@
    {
       NioSocketConnector client = new NioSocketConnector();
       client.getSessionConfig().setTcpNoDelay(ENABLE_TCP_NO_DELAY);
-      if (TCP_SEND_BUFFER_SIZE != -1)
-         client.getSessionConfig().setSendBufferSize(TCP_SEND_BUFFER_SIZE);
+      if (TCP_BUFFER_SIZE != -1)
+         client.getSessionConfig().setSendBufferSize(TCP_BUFFER_SIZE);
       client.getSessionConfig().setReuseAddress(false);
       client.getSessionConfig().setUseReadOperation(true);
 
@@ -290,8 +290,8 @@
    {
       NioSocketConnector client = new NioSocketConnector();
       client.getSessionConfig().setTcpNoDelay(ENABLE_TCP_NO_DELAY);
-      if (TCP_SEND_BUFFER_SIZE != -1)
-         client.getSessionConfig().setSendBufferSize(TCP_SEND_BUFFER_SIZE);
+      if (TCP_BUFFER_SIZE != -1)
+         client.getSessionConfig().setSendBufferSize(TCP_BUFFER_SIZE);
       client.getSessionConfig().setReuseAddress(false);
       client.getSessionConfig().setUseReadOperation(true);