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

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

Author: jmesnil
Date: 2008-03-20 10:03:51 -0400 (Thu, 20 Mar 2008)
New Revision: 3896

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:
* servers reply by packets of RESPONSE_SIZE (24 bytes by default)

Modified: projects/network-benchmark/src/network/BIOServer.java
===================================================================
--- projects/network-benchmark/src/network/BIOServer.java	2008-03-20 13:18:54 UTC (rev 3895)
+++ projects/network-benchmark/src/network/BIOServer.java	2008-03-20 14:03:51 UTC (rev 3896)
@@ -39,7 +39,7 @@
 
          while (is.read(bytes) != -1)
          {
-            os.write(bytes);
+            os.write(bytes, 0, NetworkClientTest.RESPONSE_SIZE);
          }
 
          os.close();

Modified: projects/network-benchmark/src/network/MINAServer.java
===================================================================
--- projects/network-benchmark/src/network/MINAServer.java	2008-03-20 13:18:54 UTC (rev 3895)
+++ projects/network-benchmark/src/network/MINAServer.java	2008-03-20 14:03:51 UTC (rev 3896)
@@ -30,9 +30,9 @@
          public void messageReceived(IoSession session, Object message)
                throws Exception
          {
-            // System.out.print('S');
             IoBuffer buffer = (IoBuffer) message;
-            session.write(buffer.duplicate());
+            IoBuffer response = buffer.getSlice(NetworkClientTest.RESPONSE_SIZE);
+            session.write(response);
          }
 
          @Override

Modified: projects/network-benchmark/src/network/NIOServer.java
===================================================================
--- projects/network-benchmark/src/network/NIOServer.java	2008-03-20 13:18:54 UTC (rev 3895)
+++ projects/network-benchmark/src/network/NIOServer.java	2008-03-20 14:03:51 UTC (rev 3896)
@@ -80,6 +80,8 @@
                } else
                {
                   buf.flip();
+                  buf.position(buf.remaining() - NetworkClientTest.RESPONSE_SIZE);
+                  buf.slice();
                   if (channel.write(buf) == 0)
                   {
                      System.err.println("WRITE BUFFER FULL");

Modified: projects/network-benchmark/src/network/NetworkClientTest.java
===================================================================
--- projects/network-benchmark/src/network/NetworkClientTest.java	2008-03-20 13:18:54 UTC (rev 3895)
+++ projects/network-benchmark/src/network/NetworkClientTest.java	2008-03-20 14:03:51 UTC (rev 3896)
@@ -28,6 +28,7 @@
    private static final String SERVER_HOST = "192.168.0.4";
    private static final long DURATION = 10000; // in ms
    public static final int MESSAGE_SIZE = 1024; // in bytes
+   public static final int RESPONSE_SIZE = 24; // in bytes
    private static final boolean ENABLE_TCP_NO_DELAY = false;
    static final int TCP_BUFFER_SIZE = -1; // -1 to not set it
 
@@ -47,13 +48,14 @@
    static {
       System.out.println("Duration: " + DURATION + " ms");
       System.out.println("Message size: " + MESSAGE_SIZE + " bytes");
+      System.out.println("RESPONSE size: " + RESPONSE_SIZE + " bytes");
       System.out.println("TCP no delay: " + ENABLE_TCP_NO_DELAY);
       try
       {
-         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());
+         System.out.format("TCP send buffer size: %d (default: %d)\n",
+         		TCP_BUFFER_SIZE, (new Socket()).getSendBufferSize());
+         System.out.format("TCP receive buffer size: %d (default: %d)\n",
+               TCP_BUFFER_SIZE, (new Socket()).getReceiveBufferSize());
       } catch (SocketException e)
       {
          e.printStackTrace();
@@ -63,8 +65,7 @@
 
    // Constructors --------------------------------------------------
 
-   // Public --------------------------------------------------------
-
+   // Public --------------------------------------------------------  
    
    public void test_Blocking_BIOClient_To_BIOServer() throws Exception
    {
@@ -169,13 +170,13 @@
       long start = System.currentTimeMillis();
       int count = 0;
       byte[] message = createMessage();
-      byte[] response = new byte[message.length];
+      byte[] response = new byte[RESPONSE_SIZE];
       while (System.currentTimeMillis() - start < DURATION)
       {
          os.write(message);
          
          int size = is.read(response);
-         if (size != MESSAGE_SIZE)
+         if (size != RESPONSE_SIZE)
          {
             throw new IllegalStateException("Wrong message size");
          }
@@ -208,7 +209,7 @@
          @Override
          public void run()
          {
-            byte[] b = new byte[MESSAGE_SIZE];
+            byte[] b = new byte[RESPONSE_SIZE];
             
             while (true)
             {
@@ -314,7 +315,7 @@
 
       client.setHandler(new IoHandlerAdapter()
       {
-         byte[] b = new byte[MESSAGE_SIZE];
+         byte[] b = new byte[RESPONSE_SIZE];
          
          @Override
          public void messageReceived(IoSession session, Object message)