Removed extra system out statements from PerfProducer.java

Added more test cases to the perf report
Uncommented and added clientid and subscription props to the testTopicD destination.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@779212 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 39 insertions, 12 deletions

diff --git a/java/testkit/bin/perf_report.sh b/java/testkit/bin/perf_report.sh
index 9e574cad7a..22c839e08c 100644
--- a/java/testkit/bin/perf_report.sh
+++ b/java/testkit/bin/perf_report.sh
@@ -24,7 +24,7 @@
 
 SUB_MEM=-Xmx1024M
 PUB_MEM=-Xmx1024M
-LOG_CONFIG=-Dlog4j.configuration="$QPID_TEST_HOME/etc/test.log4j"
+LOG_CONFIG="-Damqj.logging.level=WARN"
 
 . setenv.sh
 
@@ -81,20 +81,51 @@ run_testcase "Dura_Queue" "-Ddurable=true" "-Ddurable=true -Dwarmup_count=1 -Dms
 # Test 3 Dura Queue Sync
 run_testcase "Dura_Queue_Sync" "-Ddurable=true" "-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10 -Dsync_persistence=true"
 
-# Test 4 Topic
+# Test 4 Dura Queue Sync Publish and Ack
+run_testcase "Dura_SyncPubAck" "-Ddurable=true -Dsync_ack=true" "-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10 -Dsync_publish=persistent"
+
+# Test 5 Topic
 run_testcase "Topic" "-DtransDest=transientTopic" "-DtransDest=transientTopic -Dwarmup_count=1 -Dmsg_count=10"
 
-# Test 5 Durable Topic
-#run_testcase "Dura_Topic" "-Ddurable=true -DtransDest=durableTopic" "-Ddurable=true -DtransDest=durableTopic -Dwarmup_count=1 -Dmsg_count=10"
+# Test 6 Durable Topic
+run_testcase "Dura_Topic" "-Ddurable=true -DtransDest=durableTopic" "-Ddurable=true -DtransDest=durableTopic -Dwarmup_count=1 -Dmsg_count=10"
 
-# Test 6 Fanout
+# Test 7 Fanout
 run_testcase "Fanout" "-DtransDest=fanoutQueue" "-DtransDest=fanoutQueue -Dwarmup_count=1 -Dmsg_count=10"
 
-# Test 7 Small TX
+# Test 8 Small TX
 run_testcase "Small_Txs_2" "-Ddurable=true -Dtransacted=true -Dtrans_size=1" \
  "-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10 -Dtransacted=true -Dtrans_size=1"
 
-# Test 8 Large TX
+# Test 9 Large TX
 run_testcase "Large_Txs_1000" "-Ddurable=true -Dtransacted=true -Dtrans_size=10" \
  "-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10 -Dtransacted=true -Dtrans_size=10"
 
+# Test 10 256 MSG
+run_testcase "Msg_256b" "" "-Dmsg_size=256 -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 11 512 MSG
+run_testcase "Msg_512b" "" "-Dmsg_size=512 -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 12 2048 MSG
+run_testcase "Msg_2048b" "" "-Dmsg_size=2048 -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 13 Random size MSG
+run_testcase "Random_Msg_Size" "" "-Drandom_msg_size=true -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 14 Random size MSG Durable
+run_testcase "Rand_Msg_Dura" "-Ddurable=true" "-Ddurable=true -Drandom_msg_size=true -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 15 64K MSG
+run_testcase "Msg_64K" "-Damqj.tcpNoDelay=true" "-Damqj.tcpNoDelay=true -Dmsg_size=64000 -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 16 Durable 64K MSG
+run_testcase "Msg_Durable_64K" "-Ddurable=true -Damqj.tcpNoDelay=true" \
+ "-Damqj.tcpNoDelay=true -Dmsg_size=64000 -Ddurable=true -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 17 500K MSG
+run_testcase "Msg_500K" "-Damqj.tcpNoDelay=true" "-Damqj.tcpNoDelay=true -Dmsg_size=500000 -Dwarmup_count=1 -Dmsg_count=10"
+
+# Test 18 Durable 500K MSG
+run_testcase "Msg_Dura_500K" "-Damqj.tcpNoDelay=true -Ddurable=true" \
+ "-Damqj.tcpNoDelay=true -Dmsg_size=500000 -Ddurable=true -Dwarmup_count=1 -Dmsg_count=10"
diff --git a/java/testkit/etc/jndi.properties b/java/testkit/etc/jndi.properties
index c366a59f09..7a8180477b 100644
--- a/java/testkit/etc/jndi.properties
+++ b/java/testkit/etc/jndi.properties
@@ -30,6 +30,6 @@ destination.transientQueue = direct://amq.direct//testQueueT?autodelete='true'
 destination.durableQueue = direct://amq.direct//testQueueD?durable='true'&autodelete='true'
 
 destination.transientTopic = topic://amq.topic//testTopicT?autodelete='true'
-#destination.durableTopic = topic://amq.topic//testTopicD?durable='true'&autodelete='true'
+destination.durableTopic = topic://amq.topic//testTopicD?durable='true'&autodelete='true'&clientid='test'&subscription='testQueueD'
 
 destination.fanoutQueue = fanout://amq.fanout//fanoutQueue?autodelete='true'
diff --git a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
index d84c2a43e5..62392e0e83 100644
--- a/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
+++ b/java/testkit/src/main/java/org/apache/qpid/testkit/perf/PerfProducer.java
@@ -100,10 +100,6 @@ public class PerfProducer extends PerfBase
             {
                 payloads.add(MessageFactory.createMessagePayload(i).getBytes());
             }
-            
-            System.out.println("Payload size " + payloads.size());
-            System.out.println("Payload min size " + payloads.get(0).length);
-            System.out.println("Payload max size " + payloads.get(1023).length);
         }        
         else
         {