qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kgiu...@apache.org
Subject svn commit: r1071615 [3/3] - in /qpid/branches/qpid-2935/qpid: ./ bin/ cpp/ cpp/bindings/qmf2/examples/cpp/ cpp/bindings/qmf2/examples/python/ cpp/bindings/qmf2/examples/ruby/ cpp/bindings/qmf2/python/ cpp/bindings/qmf2/ruby/ cpp/bindings/qpid/ cpp/bin...
Date Thu, 17 Feb 2011 14:08:18 GMT
Propchange: qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -2,5 +2,5 @@
 /qpid/branches/0.5.x-dev/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:886720-886722
 /qpid/branches/java-broker-0-10/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:805429-821809
-/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1061302-1068442
+/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1061302-1071383
 /qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,2 +1,2 @@
 /qpid/branches/0.5.x-dev/qpid/java/test-profiles:931179
-/qpid/trunk/qpid/java/test-profiles:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/08StandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/010Excludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/010Excludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/010Excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/CPPExcludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/Excludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/Excludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/Excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/Excludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/Excludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/08Excludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/08Excludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/08Excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/JavaExcludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/JavaStandaloneExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/08StandaloneExcludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/08StandaloneExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/JavaStandaloneExcludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/08TransientExcludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/08TransientExcludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/08TransientExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/XAExcludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/XAExcludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/XAExcludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/XAExcludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/XAExcludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/clean-dir
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/clean-dir:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/clean-dir:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/clean-dir:805429-821809
-/qpid/trunk/qpid/java/test-profiles/clean-dir:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/clean-dir:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.async.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.async.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.cluster.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.cluster.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.noprefetch.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.noprefetch.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.excludes:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.excludes:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.ssl.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.ssl.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/cpp.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/cpp.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/cpp.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/default.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/default.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/default.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/default.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/default.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/default.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/java-derby.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/java-derby.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/java-derby.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/java.testprofile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/java.testprofile:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/java.testprofile:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/java.testprofile:805429-821809
-/qpid/trunk/qpid/java/test-profiles/java.testprofile:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/java.testprofile:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -2,4 +2,4 @@
 /qpid/branches/0.5.x-dev/qpid/java/test-profiles/log4j-test.xml:931179
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/log4j-test.xml:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/log4j-test.xml:805429-821809
-/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/log4j-test.xml:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/test-provider.properties:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/test-provider.properties:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/test-provider.properties:805429-821809
-/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/test-provider.properties:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /incubator/qpid/trunk/qpid/java/test-profiles/test_resources:443187-726139
 /qpid/branches/java-broker-0-10/qpid/java/test-profiles/test_resources:795950-829653
 /qpid/branches/java-network-refactor/qpid/java/test-profiles/test_resources:805429-821809
-/qpid/trunk/qpid/java/test-profiles/test_resources:1061302-1068442
+/qpid/trunk/qpid/java/test-profiles/test_resources:1061302-1071383

Modified: qpid/branches/qpid-2935/qpid/java/tools/bin/perf_report.sh
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/tools/bin/perf_report.sh?rev=1071615&r1=1071614&r2=1071615&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/tools/bin/perf_report.sh (original)
+++ qpid/branches/qpid-2935/qpid/java/tools/bin/perf_report.sh Thu Feb 17 14:08:14 2011
@@ -25,6 +25,10 @@
 SUB_MEM=-Xmx1024M
 PUB_MEM=-Xmx1024M
 LOG_CONFIG="-Damqj.logging.level=WARN"
+QUEUE="queue;{create:always,node:{x-declare:{auto-delete:true}}}"
+DURA_QUEUE="dqueue;{create:always,node:{durable:true,x-declare:{auto-delete:true}}}"
+TOPIC="amq.topic/test"
+DURA_TOPIC="amq.topic/test;{create:always,link:{durable:true}}"
 
 . setenv.sh
 
@@ -72,60 +76,65 @@ echo "==================================
 echo "|Test           |System throuput|Producer rate|Consumer Rate|Avg Latency|Min Latency|Max
Latency|"
 echo "------------------------------------------------------------------------------------------------"
 
+# The message counts and warmup counts are set to very low values for quick testing of the
script.
+# For a real performance run I recommend setting warmup count to 10k and message count in
excess of 100k
+# However for transactions, sync_publish and especially small durable transactions (which
is quite slow) I recommend
+# setting very low values to start with and experiment while increasing them slowly.
+
 # Test 1 Trans Queue
-run_testcase "Trans_Queue" "" "-Dwarmup_count=1 -Dmsg_count=10"
+#run_testcase "Trans_Queue" "-Daddress=$QUEUE" "-Daddress=$QUEUE -Dwarmup_count=1 -Dmsg_count=10"
 
 # Test 2 Dura Queue
-run_testcase "Dura_Queue" "-Ddurable=true" "-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10"
+run_testcase "Dura_Queue" "-Daddress=$DURA_QUEUE -Ddurable=true" "-Daddress=$DURA_QUEUE -Ddurable=true
-Dwarmup_count=1 -Dmsg_count=10"
 
 # Test 3 Dura Queue Sync
-run_testcase "Dura_Queue_Sync" "-Ddurable=true" "-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10
-Dsync_persistence=true"
+run_testcase "Dura_Queue_Sync" "-Daddress=$DURA_QUEUE -Ddurable=true" "-Daddress=$DURA_QUEUE
-Ddurable=true -Dwarmup_count=1 -Dmsg_count=10 -Dsync_publish=persistent"
 
 # 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"
+run_testcase "Dura_SyncPubAck" "-Daddress=$DURA_QUEUE -Ddurable=true -Dsync_ack=true" "-Daddress=$DURA_QUEUE
-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"
+run_testcase "Topic" "-Daddress=$TOPIC" "-Daddress=$TOPIC -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"
+run_testcase "Dura_Topic" "-Daddress=$DURA_TOPIC -Ddurable=true" "-Daddress=$DURA_TOPIC -Ddurable=true
-Dwarmup_count=1 -Dmsg_count=10"
 
 # Test 7 Fanout
-run_testcase "Fanout" "-DtransDest=fanoutQueue" "-DtransDest=fanoutQueue -Dwarmup_count=1
-Dmsg_count=10"
+run_testcase "Fanout" "-Daddress=amq.fanout" "-Daddress=amq.fanout -Dwarmup_count=1 -Dmsg_count=10"
 
 # 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"
+run_testcase "Small_Txs_2" "-Daddress=$DURA_QUEUE -Ddurable=true -Dtransacted=true -Dtrans_size=1"
\
+ "-Daddress=$DURA_QUEUE -Ddurable=true -Dwarmup_count=1 -Dmsg_count=10 -Dtransacted=true
-Dtrans_size=1"
 
 # 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"
+run_testcase "Large_Txs_1000" "-Daddress=$DURA_QUEUE -Ddurable=true -Dtransacted=true -Dtrans_size=10"
\
+ "-Daddress=$DURA_QUEUE -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"
+run_testcase "Msg_256b" "-Daddress=$QUEUE" "-Daddress=$QUEUE -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"
+run_testcase "Msg_512b" "-Daddress=$QUEUE" "-Daddress=$QUEUE -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"
+run_testcase "Msg_2048b" "-Daddress=$QUEUE" "-Daddress=$QUEUE -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"
+run_testcase "Random_Msg_Size" "-Daddress=$QUEUE" "-Daddress=$QUEUE -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"
+run_testcase "Rand_Msg_Dura" "-Daddress=$DURA_QUEUE -Ddurable=true" "-Daddress=$DURA_QUEUE
-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"
+run_testcase "Msg_64K" "-Daddress=$QUEUE -Damqj.tcpNoDelay=true" "-Daddress=$QUEUE -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"
+run_testcase "Msg_Durable_64K" "-Daddress=$DURA_QUEUE -Ddurable=true -Damqj.tcpNoDelay=true"
\
+ "-Daddress=$DURA_QUEUE -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"
+run_testcase "Msg_500K" "-Daddress=$QUEUE -Damqj.tcpNoDelay=true" "-Daddress=$QUEUE -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"
+run_testcase "Msg_Dura_500K" "-Daddress=$DURA_QUEUE -Damqj.tcpNoDelay=true -Ddurable=true"
\
+ "-Daddress=$DURA_QUEUE -Damqj.tcpNoDelay=true -Dmsg_size=500000 -Ddurable=true -Dwarmup_count=1
-Dmsg_count=10"

Modified: qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java?rev=1071615&r1=1071614&r2=1071615&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
(original)
+++ qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfBase.java
Thu Feb 17 14:08:14 2011
@@ -30,6 +30,9 @@ import javax.jms.Session;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 
+import org.apache.qpid.client.AMQAnyDestination;
+import org.apache.qpid.client.AMQConnection;
+
 public class PerfBase
 {
     TestParams params;
@@ -45,48 +48,21 @@ public class PerfBase
     }
 
     public void setUp() throws Exception
-    {
-        Hashtable<String,String> env = new Hashtable<String,String>();
-        env.put(Context.INITIAL_CONTEXT_FACTORY, params.getInitialContextFactory());
-        env.put(Context.PROVIDER_URL, params.getProviderURL());
+    {        
 
-        Context ctx = null;
-        try
+        if (params.getHost().equals("") || params.getPort() == -1)
         {
-            ctx = new InitialContext(env);
+            con = new AMQConnection(params.getUrl());
         }
-        catch(Exception e)
+        else
         {
-            throw new Exception("Error initializing JNDI",e);
-
+            con = new AMQConnection(params.getHost(),params.getPort(),"guest","guest","test","test");
         }
-
-        ConnectionFactory conFac = null;
-        try
-        {
-            conFac = (ConnectionFactory)ctx.lookup(params.getConnectionFactory());
-        }
-        catch(Exception e)
-        {
-            throw new Exception("Error looking up connection factory",e);
-        }
-
-        con = conFac.createConnection();
         con.start();
         session = con.createSession(params.isTransacted(),
                                     params.isTransacted()? Session.SESSION_TRANSACTED:params.getAckMode());
 
-        try
-        {
-            dest = (Destination)ctx.lookup( params.isDurable()?
-                                            params.getDurableDestination():
-                                            params.getTransientDestination()
-                                           );
-        }
-        catch(Exception e)
-        {
-            throw new Exception("Error looking up destination",e);
-        }
+        dest = new AMQAnyDestination(params.getAddress());
     }
 
     public void handleError(Exception e,String msg)

Modified: qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java?rev=1071615&r1=1071614&r2=1071615&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
(original)
+++ qpid/branches/qpid-2935/qpid/java/tools/src/main/java/org/apache/qpid/tools/TestParams.java
Thu Feb 17 14:08:14 2011
@@ -24,15 +24,22 @@ import javax.jms.Session;
 
 public class TestParams
 {
-    private String initialContextFactory = "org.apache.qpid.jndi.PropertiesFileInitialContextFactory";
-
-    private String providerURL = System.getenv("QPID_TEST_HOME") + "/etc/jndi.properties";
-
-    private String connectionFactory = "connectionFactory";
-
-    private String transientDest = "transientQueue";
+    /*
+     * By default the connection URL is used. 
+     * This allows a user to easily specify a fully fledged URL any given property.
+     * Ex. SSL parameters
+     *  
+     * By providing a host & port allows a user to simply override the URL.
+     * This allows to create multiple clients in test scripts easily,
+     * without having to deal with the long URL format. 
+     */
+    private String url = "amqp://guest:guest@clientid/testpath?brokerlist='tcp://localhost:5672'";
+    
+    private String host = "";
+    
+    private int port = -1;
 
-    private String durableDest = "durableQueue";
+    private String address = "queue; {create : always}";
 
     private int msg_size = 1024;
 
@@ -60,11 +67,11 @@ public class TestParams
 
     public TestParams()
     {
-        initialContextFactory = System.getProperty("java.naming.factory.initial",initialContextFactory);
-        providerURL = System.getProperty("java.naming.provider.url",providerURL);
-
-        transientDest = System.getProperty("transDest",transientDest);
-        durableDest = System.getProperty("durableDest",durableDest);
+     
+        url = System.getProperty("url",url);
+        host = System.getProperty("host","");
+        port = Integer.getInteger("port", -1);
+        address = System.getProperty("address","queue");
 
         msg_size  = Integer.getInteger("msg_size", 1024);
         msg_type = Integer.getInteger("msg_type",1);
@@ -80,29 +87,29 @@ public class TestParams
         random_msg_size = Boolean.getBoolean("random_msg_size");
     }
 
-    public int getAckMode()
+    public String getUrl()
     {
-        return ack_mode;
+        return url;
     }
 
-    public String getConnectionFactory()
+    public String getHost()
     {
-        return connectionFactory;
+        return host;
     }
 
-    public String getTransientDestination()
+    public int getPort()
     {
-        return transientDest;
+        return port;
     }
 
-    public String getDurableDestination()
+    public String getAddress()
     {
-        return durableDest;
+        return address;
     }
 
-    public String getInitialContextFactory()
+    public int getAckMode()
     {
-        return initialContextFactory;
+        return ack_mode;
     }
 
     public int getMsgCount()
@@ -125,11 +132,6 @@ public class TestParams
         return durable;
     }
 
-    public String getProviderURL()
-    {
-        return providerURL;
-    }
-
     public boolean isTransacted()
     {
         return transacted;

Propchange: qpid/branches/qpid-2935/qpid/packaging/windows/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -2,4 +2,4 @@
 /qpid/branches/0.6-release-windows-installer/packaging/windows:926803
 /qpid/branches/0.6-release-windows-installer/qpid/packaging/windows:926803,926865,927233
 /qpid/branches/java-network-refactor/qpid/packaging/windows:805429-825319
-/qpid/trunk/qpid/packaging/windows:1061302-1068442
+/qpid/trunk/qpid/packaging/windows:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/python/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,4 +1,4 @@
 /qpid/branches/0.5.x-dev/qpid/python:892761,894875
 /qpid/branches/java-network-refactor/qpid/python:805429-825319
 /qpid/branches/qmfv2/qpid/python:902858,902894
-/qpid/trunk/qpid/python:1061302-1068442
+/qpid/trunk/qpid/python:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/python/examples/api/spout
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,3 +1,3 @@
 /qpid/branches/qmfv2/qpid/python/examples/api/spout:902858,902894
 /qpid/branches/qpid.rnr/python/examples/api/spout:894071-896158
-/qpid/trunk/qpid/python/examples/api/spout:1061302-1068442
+/qpid/trunk/qpid/python/examples/api/spout:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/python/qpid/concurrency.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,3 +1,3 @@
 /qpid/branches/qmfv2/qpid/python/qpid/concurrency.py:902858,902894
 /qpid/branches/qpid.rnr/python/qpid/concurrency.py:894071-896158
-/qpid/trunk/qpid/python/qpid/concurrency.py:1061302-1068442
+/qpid/trunk/qpid/python/qpid/concurrency.py:1061302-1071383

Propchange: qpid/branches/qpid-2935/qpid/ruby/ext/sasl/extconf.rb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1 +1 @@
-/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:1061302-1068442
+/qpid/trunk/qpid/ruby/ext/sasl/extconf.rb:1061302-1071383

Modified: qpid/branches/qpid-2935/qpid/specs/management-schema.xml
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/specs/management-schema.xml?rev=1071615&r1=1071614&r2=1071615&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/specs/management-schema.xml (original)
+++ qpid/branches/qpid-2935/qpid/specs/management-schema.xml Thu Feb 17 14:08:14 2011
@@ -381,6 +381,8 @@
     <arg name="reason"  type="lstr"   desc="Reason for a failure"/>
     <arg name="rhost"   type="sstr"   desc="Address (i.e. DNS name, IP address, etc.)
of a remotely connected host"/>
     <arg name="user"    type="sstr"   desc="Authentication identity"/>
+    <arg name="msgDepth" type="count32" desc="Current size of queue in messages"/>
+    <arg name="byteDepth" type="count32" desc="Current size of queue in bytes"/>
   </eventArguments>
 
   <event name="clientConnect"     sev="inform" args="rhost, user"/>
@@ -396,5 +398,6 @@
   <event name="unbind"            sev="inform" args="rhost, user, exName, qName, key"/>
   <event name="subscribe"         sev="inform" args="rhost, user, qName, dest, excl, args"/>
   <event name="unsubscribe"       sev="inform" args="rhost, user, dest"/>
+  <event name="queueThresholdExceeded"       sev="warn" args="qName, msgDepth, byteDepth"/>
 </schema>
 

Modified: qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py?rev=1071615&r1=1071614&r2=1071615&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py (original)
+++ qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_10/__init__.py Thu Feb 17
14:08:14 2011
@@ -29,3 +29,7 @@ from message import *
 from query import *
 from queue import *
 from tx import *
+from lvq import *
+from priority import *
+from threshold import *
+from extensions import *

Propchange: qpid/branches/qpid-2935/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 17 14:08:14 2011
@@ -1,3 +1,3 @@
 /qpid/branches/qmfv2/qpid/python/tests_0-9/queue.py:902858,902894
 /qpid/branches/qpid.rnr/python/tests_0-9/queue.py:894071-896158
-/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:1061302-1068442
+/qpid/trunk/qpid/tests/src/py/qpid_tests/broker_0_9/queue.py:1061302-1071383

Modified: qpid/branches/qpid-2935/qpid/tools/src/py/.gitignore
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-2935/qpid/tools/src/py/.gitignore?rev=1071615&r1=1071614&r2=1071615&view=diff
==============================================================================
--- qpid/branches/qpid-2935/qpid/tools/src/py/.gitignore (original)
+++ qpid/branches/qpid-2935/qpid/tools/src/py/.gitignore Thu Feb 17 14:08:14 2011
@@ -1,20 +1,22 @@
+
+#
 #
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
 # 
-#   http://www.apache.org/licenses/LICENSE-2.0
 # 
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
+#   http://www.apache.org/licenses/LICENSE-2.0
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# "License"); you may not use this file except in compliance
 # KIND, either express or implied.  See the License for the
+# Licensed to the Apache Software Foundation (ASF) under one
+# Unless required by applicable law or agreed to in writing,
+# distributed with this work for additional information
+# or more contributor license agreements.  See the NOTICE file
+# regarding copyright ownership.  The ASF licenses this file
+# software distributed under the License is distributed on an
 # specific language governing permissions and limitations
+# to you under the Apache License, Version 2.0 (the
 # under the License.
-#
-
+# with the License.  You may obtain a copy of the License at
 /qpid-clusterc
+/qpid-configc
+/qpid-routec



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message