[jboss-cvs] JBoss Messaging SVN: r4290 - trunk/examples/jms/src/org/jboss/jms/example.

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

Author: jmesnil
Date: 2008-05-23 09:38:48 -0400 (Fri, 23 May 2008)
New Revision: 4290

Modified:
   trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
Log:
modified warmup algorithm: use 10% of the messages to warmup the system, the sample is done on the remaining 90%

Modified: trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java	2008-05-23 13:37:09 UTC (rev 4289)
+++ trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java	2008-05-23 13:38:48 UTC (rev 4290)
@@ -93,9 +93,19 @@
       {
          log.info("params = " + perfParams);
          init(perfParams.isSessionTransacted());
+         // use 10% of the messages to warm up the system
+         int warmupMessages = perfParams.getNoOfMessagesToSend() / 10;
+         log.info("warming up by sending " + warmupMessages + " messages");
+         sendMessages(warmupMessages, perfParams.getTransactionBatchSize(), perfParams.getDeliveryMode(), perfParams.isSessionTransacted());         
+         log.info("warmed up");
+         // do not take into account messages received during warmup
+         messageCount.set(0);
+         int remainingMessages = perfParams.getNoOfMessagesToSend() - warmupMessages;
+
          scheduler.scheduleAtFixedRate(command, perfParams.getSamplePeriod(), perfParams.getSamplePeriod(), TimeUnit.SECONDS);
-         sendMessages(perfParams);         
+         sendMessages(remainingMessages, perfParams.getTransactionBatchSize(), perfParams.getDeliveryMode(), perfParams.isSessionTransacted());         
          scheduler.shutdownNow();
+         
          log.info("average: " + (command.getAverage() / perfParams.getSamplePeriod()) + " msg/s");
       }
       catch (Exception e)
@@ -116,24 +126,24 @@
       }
    }
 
-   private void sendMessages(PerfParams perfParams) throws JMSException
+   private void sendMessages(int numberOfMessages, int txBatchSize, int deliveryMode, boolean transacted) throws JMSException
    {
       MessageProducer producer = session.createProducer(queue);
       producer.setDisableMessageID(true);
       producer.setDisableMessageTimestamp(true);
-      producer.setDeliveryMode(perfParams.getDeliveryMode());
+      producer.setDeliveryMode(deliveryMode);
       BytesMessage bytesMessage = session.createBytesMessage();
       byte[] payload = new byte[1024];
       bytesMessage.writeBytes(payload);
 
       boolean committed = false;
-      for (int i = 1; i <= perfParams.getNoOfMessagesToSend(); i++)
+      for (int i = 1; i <= numberOfMessages; i++)
       {
          producer.send(bytesMessage);
          messageCount.incrementAndGet();
-         if (perfParams.isSessionTransacted())
+         if (transacted)
          {
-            if (messageCount.longValue() % perfParams.getTransactionBatchSize() == 0)
+            if (messageCount.longValue() % txBatchSize == 0)
             {
                session.commit();
                committed = true;
@@ -144,7 +154,7 @@
             }
          }
       }
-      if (perfParams.isSessionTransacted() && !committed)
+      if (transacted && !committed)
       {
          session.commit();
       }
@@ -259,10 +269,7 @@
     */
    class Sampler implements Runnable
    {
-      private static final int IGNORED_SAMPLES = 4;
-      
       long sampleCount = 0;
-      AtomicLong ignoredCount = new AtomicLong(0);
       
       long startTime = 0;
       long samplesTaken = 0;
@@ -276,26 +283,14 @@
          long elapsedTime = (System.currentTimeMillis() - startTime) / 1000; // in s
          long lastCount = sampleCount;
          sampleCount = messageCount.longValue();
-         if (samplesTaken >= IGNORED_SAMPLES)
-         {
-            info(elapsedTime, sampleCount, sampleCount - lastCount, false);
-         } else {
-            info(elapsedTime, sampleCount, sampleCount - lastCount, true);
-            ignoredCount.addAndGet(sampleCount - lastCount);            
-         }
+         log.info(String.format("time elapsed: %2ds, message count: %7d, this period: %5d", 
+                     elapsedTime, sampleCount, sampleCount - lastCount));
          samplesTaken++;
       }
-
-      public void info(long elapsedTime, long totalCount, long sampleCount, boolean ignored)
-      {
-         String message = String.format("time elapsed: %2ds, message count: %7d, this period: %5d %s", 
-               elapsedTime, totalCount, sampleCount, ignored ? "[IGNORED]" : "");
-         log.info(message);
-      }
       
       public long getAverage()
       {
-         return (sampleCount - ignoredCount.longValue())/(samplesTaken - IGNORED_SAMPLES);
+         return sampleCount/samplesTaken;
       }
 
    }