[jboss-cvs] JBoss Messaging SVN: r6992 - in trunk/examples/core/perf: src/org/jboss/core/example and 1 other directory.

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

Author: timfox
Date: 2009-05-22 04:49:53 -0400 (Fri, 22 May 2009)
New Revision: 6992

Modified:
   trunk/examples/core/perf/perf.properties
   trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
   trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java
Log:
more perf params

Modified: trunk/examples/core/perf/perf.properties
===================================================================
--- trunk/examples/core/perf/perf.properties	2009-05-22 08:43:28 UTC (rev 6991)
+++ trunk/examples/core/perf/perf.properties	2009-05-22 08:49:53 UTC (rev 6992)
@@ -11,4 +11,6 @@
 host=localhost
 port=5445
 tcp-buffer=1048576
-tcp-no-delay=false
\ No newline at end of file
+tcp-no-delay=false
+send-window=1048576
+pre-ack=true
\ No newline at end of file

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-05-22 08:43:28 UTC (rev 6991)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-05-22 08:49:53 UTC (rev 6992)
@@ -91,6 +91,8 @@
       int port = Integer.valueOf(props.getProperty("port"));
       int tcpBufferSize = Integer.valueOf(props.getProperty("tcp-buffer"));
       boolean tcpNoDelay = Boolean.valueOf(props.getProperty("tcp-no-delay"));
+      boolean preAck = Boolean.valueOf(props.getProperty("pre-ack"));
+      int sendWindowSize = Integer.valueOf(props.getProperty("send-window"));
 
       log.info("num-messages: " + noOfMessages);
       log.info("num-warmup-messages: " + noOfWarmupMessages);
@@ -105,6 +107,8 @@
       log.info("port: " + port);
       log.info("tcp buffer: " + tcpBufferSize);
       log.info("tcp no delay: " + tcpNoDelay);
+      log.info("pre-ack: " + preAck);
+      log.info("send-window: " + sendWindowSize);
 
       PerfParams perfParams = new PerfParams();
       perfParams.setNoOfMessagesToSend(noOfMessages);
@@ -121,6 +125,8 @@
       perfParams.setPort(port);
       perfParams.setTcpBufferSize(tcpBufferSize);
       perfParams.setTcpNoDelay(tcpNoDelay);
+      perfParams.setPreAck(preAck);
+      perfParams.setSendWindow(sendWindowSize);
 
       return perfParams;
    }
@@ -150,7 +156,8 @@
       params.put(TransportConstants.PORT_PROP_NAME, perfParams.getPort());
 
       factory = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName(), params));
-      factory.setPreAcknowledge(true);
+      factory.setPreAcknowledge(perfParams.isPreAck());
+      factory.setProducerWindowSize(perfParams.getSendWindow());
 
       factory.setAckBatchSize(perfParams.getBatchSize());
 

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java	2009-05-22 08:43:28 UTC (rev 6991)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java	2009-05-22 08:49:53 UTC (rev 6992)
@@ -47,6 +47,8 @@
    private int port;
    private int tcpBufferSize;
    private boolean tcpNoDelay;
+   private boolean preAck;
+   private int sendWindow;
      
    public int getNoOfMessagesToSend()
    {
@@ -197,5 +199,25 @@
       this.tcpNoDelay = tcpNoDelay;
    }
 
+   public synchronized boolean isPreAck()
+   {
+      return preAck;
+   }
 
+   public synchronized void setPreAck(boolean preAck)
+   {
+      this.preAck = preAck;
+   }
+
+   public synchronized int getSendWindow()
+   {
+      return sendWindow;
+   }
+
+   public synchronized void setSendWindow(int sendWindow)
+   {
+      this.sendWindow = sendWindow;
+   }
+
+
 }