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

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

Author: clebert.suconic at jboss.com
Date: 2009-06-02 23:30:51 -0400 (Tue, 02 Jun 2009)
New Revision: 7169

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:
Adding blocking parameters

Modified: trunk/examples/core/perf/perf.properties
===================================================================
--- trunk/examples/core/perf/perf.properties	2009-06-02 22:18:03 UTC (rev 7168)
+++ trunk/examples/core/perf/perf.properties	2009-06-03 03:30:51 UTC (rev 7169)
@@ -14,4 +14,6 @@
 tcp-buffer=1048576
 tcp-no-delay=false
 send-window=1048576
-pre-ack=true
\ No newline at end of file
+pre-ack=true
+block-ack=true
+block-persistent=true

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-06-02 22:18:03 UTC (rev 7168)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfBase.java	2009-06-03 03:30:51 UTC (rev 7169)
@@ -128,6 +128,8 @@
       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"));
+      boolean blockOnACK = Boolean.valueOf(props.getProperty("block-ack", "false"));
+      boolean blockOnPersistent = Boolean.valueOf(props.getProperty("block-persistent", "false"));
 
       log.info("num-messages: " + noOfMessages);
       log.info("num-warmup-messages: " + noOfWarmupMessages);
@@ -145,6 +147,8 @@
       log.info("tcp no delay: " + tcpNoDelay);
       log.info("pre-ack: " + preAck);
       log.info("send-window: " + sendWindowSize);
+      log.info("block-ack:" + blockOnACK);
+      log.info("block-persistent:" + blockOnPersistent);
 
       PerfParams perfParams = new PerfParams();
       perfParams.setNoOfMessagesToSend(noOfMessages);
@@ -163,6 +167,8 @@
       perfParams.setTcpNoDelay(tcpNoDelay);
       perfParams.setPreAck(preAck);
       perfParams.setSendWindow(sendWindowSize);
+      perfParams.setBlockOnACK(blockOnACK);
+      perfParams.setBlockOnPersistent(blockOnPersistent);
 
       return perfParams;
    }
@@ -196,6 +202,9 @@
       factory.setProducerWindowSize(perfParams.getSendWindow());
 
       factory.setAckBatchSize(perfParams.getBatchSize());
+      
+      factory.setBlockOnAcknowledge(perfParams.isBlockOnACK());
+      factory.setBlockOnPersistentSend(perfParams.isBlockOnPersistent());
 
       session = factory.createSession(!transacted, !transacted);
    }

Modified: trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java
===================================================================
--- trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java	2009-06-02 22:18:03 UTC (rev 7168)
+++ trunk/examples/core/perf/src/org/jboss/core/example/PerfParams.java	2009-06-03 03:30:51 UTC (rev 7169)
@@ -49,7 +49,29 @@
    private boolean tcpNoDelay;
    private boolean preAck;
    private int sendWindow;
+   private boolean blockOnPersistent = true;
+   private boolean blockOnACK = true;
      
+   public boolean isBlockOnPersistent()
+   {
+      return blockOnPersistent;
+   }
+
+   public void setBlockOnPersistent(boolean blockOnPersistent)
+   {
+      this.blockOnPersistent = blockOnPersistent;
+   }
+
+   public boolean isBlockOnACK()
+   {
+      return blockOnACK;
+   }
+
+   public void setBlockOnACK(boolean blockOnACK)
+   {
+      this.blockOnACK = blockOnACK;
+   }
+
    public int getNoOfMessagesToSend()
    {
       return noOfMessagesToSend;
@@ -156,7 +178,7 @@
               durable + ", session transacted = " + isSessionTransacted +
               (isSessionTransacted ? ", transaction batch size = " + batchSize : "") + ", drain queue = " + drainQueue +
               ", queue name = " + queueName + 
-              ", Throttle rate = " + throttleRate;
+              ", Throttle rate = " + throttleRate + ", blockOnPersistent = " + blockOnPersistent + ". blockOnACK = " + blockOnACK;
    }
 
    public synchronized String getHost()