You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2012/07/18 18:58:40 UTC
svn commit: r1363017 - in /qpid/trunk/qpid/java/perftests: etc/chartdefs/
etc/testdefs/ src/main/java/org/apache/qpid/disttest/client/
Author: kwall
Date: Wed Jul 18 16:58:39 2012
New Revision: 1363017
URL: http://svn.apache.org/viewvc?rev=1363017&view=rev
Log:
QPID-4143: include baseline data in charts.
Applied patch from Philip Harvey <ph...@philharveyonline.com>.
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Transient messages
xAxisTitle=Message Size (B)
@@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s)
series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Persistent messages
xAxisTitle=Message Size (B)
@@ -27,4 +27,6 @@ series.1.statement=SELECT payloadSizeB,
series.1.legend=Current
series.1.dir=${csvCurrentDir}
-# Define series3/4 to chart the baseline
+series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Varying number of producers
chartSubtitle=Persistent 1KB messages
xAxisTitle=Producers
@@ -34,3 +34,7 @@ series.2.dir=${csvCurrentDir}
series.3.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '10'
series.3.legend=10 Consumer
series.3.dir=${csvCurrentDir}
+
+series.4.statement=SELECT totalNumberOfProducers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfConsumers = '1'
+series.4.legend=1 Consumer (baseline)
+series.4.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Varying number of consumers
chartSubtitle=Persistent 1KB messages
xAxisTitle=Consumers
@@ -34,3 +34,7 @@ series.2.dir=${csvCurrentDir}
series.3.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10'
series.3.legend=10 Producers
series.3.dir=${csvCurrentDir}
+
+series.4.statement=SELECT totalNumberOfConsumers, throughputKbPerS FROM VaryingNumberOfParticipants WHERE participantName = 'All' and totalNumberOfProducers = '10'
+series.4.legend=10 Producers (baseline)
+series.4.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef Wed Jul 18 16:58:39 2012
@@ -27,3 +27,7 @@ series.1.statement=SELECT testName, thro
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.2.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes WHERE acknowledgeMode = '1' AND participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
+
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef Wed Jul 18 16:58:39 2012
@@ -27,3 +27,6 @@ series.1.statement=SELECT testName, thro
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.2.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes WHERE acknowledgeMode = '0' AND participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Transaction Batch Size
chartSubtitle=Persistent 1KB messages
xAxisTitle=Batch Size
@@ -27,3 +27,7 @@ series.1.statement=SELECT batchSize, thr
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.2.statement=SELECT batchSize, throughputKbPerS FROM BatchSize WHERE participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
+
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef Wed Jul 18 16:58:39 2012
@@ -27,3 +27,6 @@ series.1.statement=SELECT testName, thro
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.2.statement=SELECT testName, throughputKbPerS FROM QueueTypes WHERE participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1500-Topic-NumberOfConsumers.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Number of topic consumers
chartSubtitle=Transient 1KB messages
xAxisTitle=Numer of consumers
@@ -27,3 +27,6 @@ series.1.statement=SELECT testName, thro
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.2.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfConsumers WHERE participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1501-Topic-NumberOfTopics.chartdef Wed Jul 18 16:58:39 2012
@@ -17,7 +17,7 @@
# under the License.
#
-chartType=LINE
+chartType=XYLINE
chartTitle=Number of topics
chartSubtitle=Transient 1KB messages
xAxisTitle=Numer of topics
@@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s)
series.1.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfTopics WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT testName, throughputKbPerS FROM Topic-NumberOfTopics WHERE participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1502-Topic-Persistence.chartdef Wed Jul 18 16:58:39 2012
@@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s)
series.1.statement=SELECT isDurableSubscription, throughputKbPerS FROM Topic-Persistence WHERE participantName = 'All Consumers'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT isDurableSubscription, throughputKbPerS FROM Topic-Persistence WHERE participantName = 'All Consumers'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1503-Topic-AckModes.chartdef Wed Jul 18 16:58:39 2012
@@ -26,3 +26,7 @@ yAxisTitle=Throughput (KB/s)
series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM Topic-AckModes WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+
+series.2.statement=SELECT acknowledgeMode, throughputKbPerS FROM Topic-AckModes WHERE participantName = 'All'
+series.2.legend=Baseline
+series.2.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2001-Latency-MessageSize-Transient.chartdef Wed Jul 18 16:58:39 2012
@@ -31,6 +31,10 @@ series.2.statement=SELECT payloadSizeB,
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT payloadSizeB, minLatency,0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
-series.3.legend=Minimum latency
-series.3.dir=${csvCurrentDir}
+series.3.statement=SELECT payloadSizeB, averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
+series.3.legend=Average latency (baseline)
+series.3.dir=${csvBaselineDir}
+
+series.4.statement=SELECT payloadSizeB, minLatency,0 FROM Latency-MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
+series.4.legend=Minimum latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2002-Latency-MessageSize-Persistent.chartdef Wed Jul 18 16:58:39 2012
@@ -31,6 +31,10 @@ series.2.statement=SELECT payloadSizeB,
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
-series.3.legend=Minimum latency
-series.3.dir=${csvCurrentDir}
\ No newline at end of file
+series.3.statement=SELECT payloadSizeB, averageLatency, latencyStandardDeviation FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
+series.3.legend=Average latency (baseline)
+series.3.dir=${csvBaselineDir}
+
+series.4.statement=SELECT payloadSizeB, minLatency, 0 FROM Latency-MessageSize WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
+series.4.legend=Minimum latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2011-Latency-QueuesWithNonOverlappingSelectors-Transient.chartdef Wed Jul 18 16:58:39 2012
@@ -31,7 +31,10 @@ series.2.statement=SELECT totalNumberOfC
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
-series.3.legend=Min latency
-series.3.dir=${csvCurrentDir}
+series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
+series.3.legend=Average latency (baseline)
+series.3.dir=${csvBaselineDir}
+series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - NON_PERSISTENT%'
+series.4.legend=Min latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2012-Latency-QueuesWithOverlappingSelectors-Transient.chartdef Wed Jul 18 16:58:39 2012
@@ -31,6 +31,10 @@ series.2.statement=SELECT totalNumberOfC
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%'
-series.3.legend=Min latency
-series.3.dir=${csvCurrentDir}
+series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%'
+series.3.legend=Average latency (baseline)
+series.3.dir=${csvBaselineDir}
+
+series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - NON_PERSISTENT%'
+series.4.legend=Min latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2021-Latency-QueuesWithNonOverlappingSelectors-Persistent.chartdef Wed Jul 18 16:58:39 2012
@@ -31,6 +31,10 @@ series.2.statement=SELECT totalNumberOfC
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
-series.3.legend=Min latency
-series.3.dir=${csvCurrentDir}
+series.3.statement=SELECT totalNumberOfConsumers, averageLatency, latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
+series.3.legend=Average latency (baseline)
+series.3.dir=${csvBaselineDir}
+
+series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%non overlapping - PERSISTENT'
+series.4.legend=Min latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2022-Latency-QueuesWithOverlappingSelectors-Persistent.chartdef Wed Jul 18 16:58:39 2012
@@ -31,7 +31,10 @@ series.2.statement=SELECT totalNumberOfC
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
-series.3.legend=Min latency
-series.3.dir=${csvCurrentDir}
+series.3.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
+series.3.legend=Average latency (baseline)
+series.3.dir=${csvBaselineDir}
+series.4.statement=SELECT totalNumberOfConsumers, minLatency, 0 FROM Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and testName like '%overlapping 50% - PERSISTENT%'
+series.4.legend=Min latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2031-Latency-VaryingNumberOfParticipants.chartdef Wed Jul 18 16:58:39 2012
@@ -39,3 +39,6 @@ series.4.statement=SELECT totalNumberOfC
series.4.legend=10 producers
series.4.dir=${csvCurrentDir}
+series.5.statement=SELECT totalNumberOfConsumers, averageLatency,latencyStandardDeviation FROM Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and testName like '% - 10 producers - PERSISTENT'
+series.5.legend=10 producers (baseline)
+series.5.dir=${csvBaselineDir}
Modified: qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef (original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/2041-Latency-QueueTypes.chartdef Wed Jul 18 16:58:39 2012
@@ -31,6 +31,10 @@ series.2.statement=SELECT testName, aver
series.2.legend=Average Latency
series.2.dir=${csvCurrentDir}
-series.3.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
-series.3.legend=Minimum latency
-series.3.dir=${csvCurrentDir}
+series.3.statement=SELECT testName, averageLatency,latencyStandardDeviation FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
+series.3.legend=Average Latency (baseline)
+series.3.dir=${csvBaselineDir}
+
+series.4.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
+series.4.legend=Minimum latency
+series.4.dir=${csvCurrentDir}
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/AcknowledgementModes.json Wed Jul 18 16:58:39 2012
@@ -5,13 +5,11 @@
"_iterations":[
{
"_messageSize": 1024,
- "_maximumDuration": 30000,
"_acknowledgeMode": 1,
"_deliveryMode": 1
},
{
"_messageSize": 1024,
- "_maximumDuration": 30000,
"_acknowledgeMode": 0,
"_deliveryMode": 1
}
@@ -39,7 +37,8 @@
"_producers": [
{
"_name": "Producer1",
- "_destinationName": "direct://amq.direct//testQueue"
+ "_destinationName": "direct://amq.direct//testQueue",
+ "_maximumDuration": 30000
}
]
}
@@ -59,7 +58,8 @@
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//testQueue"
+ "_destinationName": "direct://amq.direct//testQueue",
+ "_maximumDuration": 30000
}
]
}
@@ -74,13 +74,11 @@
"_iterations":[
{
"_messageSize": 1024,
- "_maximumDuration": 30000,
"_acknowledgeMode": 1,
"_deliveryMode": 2
},
{
"_messageSize": 1024,
- "_maximumDuration": 30000,
"_acknowledgeMode": 0,
"_deliveryMode": 2
}
@@ -104,7 +102,8 @@
"_producers": [
{
"_name": "Producer1",
- "_destinationName": "direct://amq.direct//testQueue?durable='true'"
+ "_destinationName": "direct://amq.direct//testQueue?durable='true'",
+ "_maximumDuration": 30000
}
]
}
@@ -124,7 +123,8 @@
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//testQueue?durable='true'"
+ "_destinationName": "direct://amq.direct//testQueue?durable='true'",
+ "_maximumDuration": 30000
}
]
}
Modified: qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json (original)
+++ qpid/trunk/qpid/java/perftests/etc/testdefs/MessageSize.json Wed Jul 18 16:58:39 2012
@@ -4,48 +4,37 @@
"_name": "Message Size - 1P-1C - TRANSIENT";
"_iterations":[
{
- "_messageSize": 256,
- "_maximumDuration": 30000
+ "_messageSize": 256
},
{
- "_messageSize": 512,
- "_maximumDuration": 30000
+ "_messageSize": 512
},
{
- "_messageSize": 1024,
- "_maximumDuration": 30000
+ "_messageSize": 1024
},
{
- "_messageSize": 2048,
- "_maximumDuration": 30000
+ "_messageSize": 2048
},
{
- "_messageSize": 4096,
- "_maximumDuration": 30000
+ "_messageSize": 4096
},
{
- "_messageSize": 8192,
- "_maximumDuration": 30000
+ "_messageSize": 8192
},
{
- "_messageSize": 16384,
- "_maximumDuration": 30000
+ "_messageSize": 16384
},
{
- "_messageSize": 32768,
- "_maximumDuration": 30000
+ "_messageSize": 32768
},
{
- "_messageSize": 65536,
- "_maximumDuration": 30000
+ "_messageSize": 65536
},
{
- "_messageSize": 131072,
- "_maximumDuration": 30000
+ "_messageSize": 131072
},
{
- "_messageSize": 262144,
- "_maximumDuration": 30000
+ "_messageSize": 262144
}
],
"_queues":[
@@ -73,7 +62,8 @@
{
"_name": "Producer1",
"_destinationName": "direct://amq.direct//messageSize",
- "_deliveryMode": 1
+ "_deliveryMode": 1,
+ "_maximumDuration": 30000
}
]
}
@@ -94,7 +84,8 @@
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//messageSize"
+ "_destinationName": "direct://amq.direct//messageSize",
+ "_maximumDuration": 30000
}
]
}
@@ -108,48 +99,37 @@
"_name": "Message Size - 1P-1C - PERSISTENT";
"_iterations":[
{
- "_messageSize": 256,
- "_maximumDuration": 30000
+ "_messageSize": 256
},
{
- "_messageSize": 512,
- "_maximumDuration": 30000
+ "_messageSize": 512
},
{
- "_messageSize": 1024,
- "_maximumDuration": 30000
+ "_messageSize": 1024
},
{
- "_messageSize": 2048,
- "_maximumDuration": 30000
+ "_messageSize": 2048
},
{
- "_messageSize": 4096,
- "_maximumDuration": 30000
+ "_messageSize": 4096
},
{
- "_messageSize": 8192,
- "_maximumDuration": 30000
+ "_messageSize": 8192
},
{
- "_messageSize": 16384,
- "_maximumDuration": 30000
+ "_messageSize": 16384
},
{
- "_messageSize": 32768,
- "_maximumDuration": 30000
+ "_messageSize": 32768
},
{
- "_messageSize": 65536,
- "_maximumDuration": 30000
+ "_messageSize": 65536
},
{
- "_messageSize": 131072,
- "_maximumDuration": 30000
+ "_messageSize": 131072
},
{
- "_messageSize": 262144,
- "_maximumDuration": 30000
+ "_messageSize": 262144
}
],
"_queues":[
@@ -178,7 +158,9 @@
{
"_name": "Producer1",
"_destinationName": "direct://amq.direct//messageSize?durable='true'",
- "_deliveryMode": 2
+ "_deliveryMode": 2,
+ "_maximumDuration": 30000
+
}
]
}
@@ -199,7 +181,8 @@
"_consumers": [
{
"_name": "Consumer1",
- "_destinationName": "direct://amq.direct//messageSize?durable='true'"
+ "_destinationName": "direct://amq.direct//messageSize?durable='true'",
+ "_maximumDuration": 30000
}
]
}
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ConsumerParticipant.java Wed Jul 18 16:58:39 2012
@@ -86,6 +86,8 @@ public class ConsumerParticipant impleme
}
else
{
+ LOGGER.info("Consumer {} registering listener", getName());
+
_jmsDelegate.registerListener(_command.getParticipantName(), new MessageListener(){
@Override
@@ -120,7 +122,7 @@ public class ConsumerParticipant impleme
private void synchronousRun()
{
- LOGGER.debug("entered synchronousRun: " + this);
+ LOGGER.info("Consumer {} about to consume messages", getName());
_startTime = System.currentTimeMillis();
Modified: qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java?rev=1363017&r1=1363016&r2=1363017&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java (original)
+++ qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java Wed Jul 18 16:58:39 2012
@@ -78,6 +78,8 @@ public class ProducerParticipant impleme
_limiter = ExecutorWithLimitsFactory.createExecutorWithLimit(startTime, requiredDuration);
+ LOGGER.info("Producer {} about to send messages", getName());
+
while (true)
{
try
@@ -162,6 +164,7 @@ public class ProducerParticipant impleme
long sleepTime = _command.getStartDelay();
if (sleepTime > 0)
{
+ LOGGER.debug("{} sleeping for {} milliseconds before starting", getName(), sleepTime);
// start delay is specified. Sleeping...
doSleep(sleepTime);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org