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

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

Author: jmesnil
Date: 2008-05-28 10:51:10 -0400 (Wed, 28 May 2008)
New Revision: 4322

Modified:
   trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
Log:
- in PerfListener, do not increment messageCount before comparing it to the number of warmup messages (or it will hang if the number == 0)
- fixed Sampler.getAverage() to use a double

Modified: trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java
===================================================================
--- trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java	2008-05-28 13:59:11 UTC (rev 4321)
+++ trunk/examples/jms/src/org/jboss/jms/example/PerfExample.java	2008-05-28 14:51:10 UTC (rev 4322)
@@ -113,7 +113,7 @@
          sendMessages(perfParams.getNoOfMessagesToSend(), perfParams.getTransactionBatchSize(), perfParams.getDeliveryMode(), perfParams.isSessionTransacted());
          scheduler.shutdownNow();
 
-         log.info("average: " + (command.getAverage() / perfParams.getSamplePeriod()) + " msg/s");
+         log.info(String.format("average: %.2f msg/s", (command.getAverage() / perfParams.getSamplePeriod())));
       }
       catch (Exception e)
       {
@@ -244,7 +244,7 @@
             if (warmingUp)
             {
                boolean committed = checkCommit();
-               if (messageCount.incrementAndGet() == perfParams.getNoOfWarmupMessages())
+               if (messageCount.longValue() == perfParams.getNoOfWarmupMessages())
                {
                   log.info("warmed up after receiving " + messageCount.longValue() + " msgs");
                   if (!committed)
@@ -254,6 +254,8 @@
                   warmingUp = false;
                   // reset messageCount to take stats
                   messageCount.set(0);
+               } else {
+                  messageCount.incrementAndGet();
                }
                return;
             }
@@ -274,7 +276,7 @@
                }
                countDownLatch.countDown();
                scheduler.shutdownNow();
-               log.info("average: " + command.getAverage() + " msg/s");
+               log.info(String.format("average: %.2f msg/s", command.getAverage()));
             }
          }
          catch (Exception e)
@@ -322,9 +324,9 @@
          samplesTaken++;
       }
 
-      public long getAverage()
+      public double getAverage()
       {
-         return sampleCount / samplesTaken;
+         return (1.0 * sampleCount)/samplesTaken;
       }
 
    }