Author: kwall
Date: Fri Sep 21 12:34:44 2012
New Revision: 1388458
URL: http://svn.apache.org/viewvc?rev=1388458&view=rev
Log:
QPID-4338: [Java Performance Charts] Added descriptions to all charts; use
consistent colours across all charts; use dotted series for baselines
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.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/1050-VaryingNumberOfProducerSessionsSingleConnection.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/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1001-MessageSize-Transient-ByteSec.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Transient messages
+chartDescription=1P 1C, transient, auto-ack, with message payload between
256-262144 bytes.
+
xAxisTitle=Message Size (B)
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.1.colourName=red
series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize
WHERE testName like '%TRANSIENT' AND participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1002-MessageSize-Persistent-ByteSec.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Persistent messages
+chartDescription=1P 1C, persistent, auto-ack, with message payload between
256-262144 bytes.
+
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (KB/s)
series.1.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize
WHERE testName like '% PERSISTENT' AND participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT payloadSizeB, throughputKbPerS FROM MessageSize
WHERE testName like '% PERSISTENT' AND participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1003-MessageSize-Transient-MsgSec.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Transient messages
+chartDescription=1P 1C, transient, auto-ack, with message payload between
256-262144 bytes.
+
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT payloadSizeB, throughputMessagesPerS FROM
MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM
MessageSize WHERE testName like '%TRANSIENT' AND participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1004-MessageSize-Persistent-MsgSec.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=XYLINE
chartTitle=Impact of Message Size
chartSubtitle=Persistent messages
+chartDescription=1P 1C, persistent, auto-ack, with message payload between
256-262144 bytes.
+
xAxisTitle=Message Size (B)
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT payloadSizeB, throughputMessagesPerS FROM
MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.2.colourName=red
series.2.statement=SELECT payloadSizeB, throughputMessagesPerS FROM
MessageSize WHERE testName like '% PERSISTENT' AND participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1011-VaryingNumberOfProducers-AutoAck.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,28 @@
chartType=XYLINE
chartTitle=Varying number of producers - auto ack
chartSubtitle=Persistent 1KB messages
+chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB.
+
xAxisTitle=Producers
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '1' and acknowledgeMode = '1'
series.1.legend=1 Consumer
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '5' and acknowledgeMode = '1'
series.2.legend=5 Consumer
series.2.dir=${csvCurrentDir}
+series.2.colourName=blue
series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '10' and acknowledgeMode = '1'
series.3.legend=10 Consumer
series.3.dir=${csvCurrentDir}
+series.3.colourName=green
series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '1' and acknowledgeMode = '1'
series.4.legend=1 Consumer (baseline)
series.4.dir=${csvBaselineDir}
+series.4.colourName=dark_red
+series.4.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1012-VaryingNumberOfConsumers-AutoAck.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,28 @@
chartType=XYLINE
chartTitle=Varying number of consumers - auto ack
chartSubtitle=Persistent 1KB messages
+chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB.
+
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '1' and acknowledgeMode = '1'
series.1.legend=1 Producer
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '5' and acknowledgeMode = '1'
series.2.legend=5 Producers
series.2.dir=${csvCurrentDir}
+series.2.colourName=green
series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '10' and acknowledgeMode = '1'
series.3.legend=10 Producers
series.3.dir=${csvCurrentDir}
+series.3.colourName=red
series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '10' and acknowledgeMode = '1'
series.4.legend=10 Producers (baseline)
series.4.dir=${csvBaselineDir}
+series.4.colourName=dark_red
+series.4.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1015-VaryingNumberOfProducers-SessionTrans.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,28 @@
chartType=XYLINE
chartTitle=Varying number of producers - transacted
chartSubtitle=Persistent 1KB messages
+chartDescription=1,2,5,10 P/Cs, persistent, transacted, with message payload
1KB.
+
xAxisTitle=Producers
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '1' and acknowledgeMode = '0'
series.1.legend=1 Consumer
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '5' and acknowledgeMode = '0'
series.2.legend=5 Consumer
series.2.dir=${csvCurrentDir}
+series.2.colourName=blue
series.3.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '10' and acknowledgeMode = '0'
series.3.legend=10 Consumer
series.3.dir=${csvCurrentDir}
+series.3.colourName=green
series.4.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfConsumers = '1' and acknowledgeMode = '0'
series.4.legend=1 Consumer (baseline)
series.4.dir=${csvBaselineDir}
+series.4.colourName=dark_red
+series.4.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1016-VaryingNumberOfConsumers-SessionTrans.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,28 @@
chartType=XYLINE
chartTitle=Varying number of consumers - transacted
chartSubtitle=Persistent 1KB messages
+chartDescription=1,2,5,10 P/Cs, persistent, transacted, with message payload
1KB.
+
xAxisTitle=Consumers
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '1' and acknowledgeMode = '0'
series.1.legend=1 Producer
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '5' and acknowledgeMode = '0'
series.2.legend=5 Producers
series.2.dir=${csvCurrentDir}
+series.2.colourName=green
series.3.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '10' and acknowledgeMode = '0'
series.3.legend=10 Producers
series.3.dir=${csvCurrentDir}
+series.3.colourName=red
series.4.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
VaryingNumberOfParticipants WHERE participantName = 'All' and
totalNumberOfProducers = '10' and acknowledgeMode = '0'
series.4.legend=10 Producers (baseline)
series.4.dir=${csvBaselineDir}
+series.4.colourName=dark_red
+series.4.strokeWidth=-1
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
Fri Sep 21 12:34:44 2012
@@ -19,17 +19,20 @@
chartType=BAR
chartTitle=Performance of acknowledgement modes
-chartSubtitle=Persistent messages (1024b)
+chartSubtitle=Persistent messages (1KB)
+chartDescription=1P 1C, persistent, with message payload 1KB.
+
xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM
AcknowledgementModes WHERE testName like 'Persistent%' AND participantName =
'All' ORDER BY acknowledgeMode
series.1.legend=Current
series.1.dir=${csvCurrentDir}
-
+series.1.colourName=blue
series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM
AcknowledgementModes WHERE testName like 'Persistent%' AND participantName =
'All' ORDER BY acknowledgeMode
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,17 @@
chartType=BAR
chartTitle=Performance of acknowledgement modes
chartSubtitle=Transient messages (1024b)
+chartDescription=1P 1C, transient, with message payload 1KB.
+
xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM
AcknowledgementModes WHERE testName like 'Transient%' AND participantName =
'All' ORDER BY acknowledgeMode
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM
AcknowledgementModes WHERE testName like 'Transient%' AND participantName =
'All' ORDER BY acknowledgeMode
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
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=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef
(original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1030-BatchSize.chartdef Fri
Sep 21 12:34:44 2012
@@ -20,14 +20,19 @@
chartType=XYLINE
chartTitle=Transaction Batch Size
chartSubtitle=Persistent 1KB messages
+chartDescription=1P 1C, persistent, transacted with message payload 1KB and
batch sizes 1-100 messages
+
xAxisTitle=Batch Size
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize
WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT batchSize, throughputMessagesPerS FROM BatchSize
WHERE participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
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=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
--- qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef
(original)
+++ qpid/trunk/qpid/java/perftests/etc/chartdefs/1040-QueueTypes.chartdef Fri
Sep 21 12:34:44 2012
@@ -20,13 +20,17 @@
chartType=BAR
chartTitle=Queue Types
chartSubtitle=Persistent 1KB messages
+chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted
queue - 160,000 random keys, Priority - iteriates priority 0..9.
+
xAxisTitle=Queue Types
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes
WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT testName, throughputMessagesPerS FROM QueueTypes
WHERE participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
Modified:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1050-VaryingNumberOfProducerSessionsSingleConnection.chartdef
Fri Sep 21 12:34:44 2012
@@ -20,6 +20,7 @@
chartType=XYLINE
chartTitle=Varying number of producer sessions on single connection
chartSubtitle=Persistent messages (1024b)
+chartDescription=1-80P on single connection, 20C on separate connections,
persistent, transacted with message payload 1KB.
xAxisTitle=Number of producer sessions
yAxisTitle=Throughput (KB/s)
@@ -28,15 +29,21 @@ yAxisTitle=Throughput (KB/s)
series.1.statement=SELECT testName, throughputKbPerS FROM
VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All'
series.1.legend=Current - End-to-end throughput
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT testName, throughputKbPerS FROM
VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All
Producers'
series.2.legend=Current - Producer only throughput
series.2.dir=${csvCurrentDir}
+series.2.colourName=blue
series.3.statement=SELECT testName, throughputKbPerS FROM
VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All'
series.3.legend=Baseline - End-to-end throughput
series.3.dir=${csvBaselineDir}
+series.3.colourName=dark_red
+series.3.strokeWidth=-1
series.4.statement=SELECT testName, throughputKbPerS FROM
VaryingNumberOfProducerSessionsSingleConnection WHERE participantName = 'All
Producers'
series.4.legend=Baseline - Producer only throughput
series.4.dir=${csvBaselineDir}
+series.4.colourName=dark_blue
+series.4.strokeWidth=-1
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=XYLINE
chartTitle=Number of topic consumers
chartSubtitle=Transient 1KB messages
+chartDescription=1P 1-100C transient, auto-ack with message payload 1KB.
+
xAxisTitle=Numer of consumers
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
Topic-NumberOfConsumers WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT totalNumberOfConsumers, throughputMessagesPerS FROM
Topic-NumberOfConsumers WHERE participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=XYLINE
chartTitle=Number of topics
chartSubtitle=Transient 1KB messages
+chartDescription=1,10,50,100 PC, transient, auto-ack, with each PC pair having
own topic, message payload 1KB.
+
xAxisTitle=Numer of topics
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
Topic-NumberOfTopics WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=red
series.2.statement=SELECT totalNumberOfProducers, throughputMessagesPerS FROM
Topic-NumberOfTopics WHERE participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.strokeWidth=-1
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=BAR
chartTitle=Topic transient/durable subscriptions
chartSubtitle=1KB messages
-xAxisTitle=Durable subscription
+chartDescription=1P 10C, auto-ack, message payload 1KB, transient messages on
non-durable sub, persistent messages on durable sub
+
+xAxisTitle=Subscription type (true durable, false non durable)
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM
Topic-Persistence WHERE participantName = 'All Consumers'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT isDurableSubscription, throughputMessagesPerS FROM
Topic-Persistence WHERE participantName = 'All Consumers'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.stokeWidth=2
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,13 +20,18 @@
chartType=BAR
chartTitle=Topic acknowledge modes
chartSubtitle=Transient 1KB messages
-xAxisTitle=Ack Mode
+chartDescription=1P 10C, transient, non-durable subscription, message payload
1KB
+
+xAxisTitle=Ack Mode (0=transaction 1=auto-ack)
yAxisTitle=Throughput (messages/s)
series.1.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM
Topic-AckModes WHERE participantName = 'All'
series.1.legend=Current
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT acknowledgeMode, throughputMessagesPerS FROM
Topic-AckModes WHERE participantName = 'All'
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+series.2.colourName=dark_red
+series.2.stokeWidth=2
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Impact of message size on latency
chartSubtitle=Transient messages
+chartDescription=1P 1C, transient, auto-ack, with message payload between
256-262144 bytes.
+
xAxisTitle=Message Size (B)
yAxisTitle=Latency (millis)
series.1.statement=SELECT payloadSizeB, maxLatency, 0 FROM Latency-MessageSize
WHERE testName like '%TRANSIENT' AND participantName = 'All Consumers'
series.1.legend=Maximum latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT payloadSizeB,
averageLatency,latencyStandardDeviation FROM Latency-MessageSize WHERE testName
like '%TRANSIENT' AND participantName = 'All Consumers'
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
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}
+series.4.colourName=green
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Impact of message size on latency
chartSubtitle=Persistent messages
+chartDescription=1P 1C, persistent, auto-ack, with message payload between
256-262144 bytes.
+
xAxisTitle=Message Size (B)
yAxisTitle=Latency (millis)
series.1.statement=SELECT payloadSizeB, maxLatency, 0 FROM Latency-MessageSize
WHERE testName like '%PERSISTENT' AND participantName = 'All Consumers'
series.1.legend=Maximum latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT payloadSizeB, averageLatency,
latencyStandardDeviation FROM Latency-MessageSize WHERE testName like
'%PERSISTENT' AND participantName = 'All Consumers'
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
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}
+series.4.colourName=green
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Latency with consumers having non-overlapping selectors
chartSubtitle=Transient 1KB messages
+chartDescription=1P 1-10C, transient, auto-ack, with message payload between
1KB.
+
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM
Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and
testName like '%non overlapping - NON_PERSISTENT%'
series.1.legend=Max latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE
participantName = 'All Consumers' and testName like '%non overlapping -
NON_PERSISTENT%'
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
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}
+series.4.colourName=green
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Latency with consumers having 50%-overlapping selectors
chartSubtitle=Transient 1KB messages
+chartDescription=1P 1-10C, transient, auto-ack, with message payload between
1KB.
+
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM
Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and
testName like '%overlapping 50% - NON_PERSISTENT%'
series.1.legend=Max latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE
participantName = 'All Consumers' and testName like '%overlapping 50% -
NON_PERSISTENT%'
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
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}
+series.4.colourName=green
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Latency with consumers having non-overlapping selectors
chartSubtitle=Persistent 1KB messages
+chartDescription=1P 1-10C, persistent, auto-ack, with message payload between
1KB.
+
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
series.1.statement=SELECT totalNumberOfConsumers, maxLatency,0 FROM
Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and
testName like '%non overlapping - PERSISTENT'
series.1.legend=Max latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers, averageLatency,
latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE participantName
= 'All Consumers' and testName like '%non overlapping - PERSISTENT'
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
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}
+series.4.colourName=green
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Latency with consumers having 50%-overlapping selectors
chartSubtitle=Persistent 1KB messages
+chartDescription=1P 1-10C, persistent, auto-ack, with message payload between
1KB.
+
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
series.1.statement=SELECT totalNumberOfConsumers, maxLatency, 0 FROM
Latency-QueuesWithSelectors WHERE participantName = 'All Consumers' and
testName like '%overlapping 50% - PERSISTENT%'
series.1.legend=Max latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM Latency-QueuesWithSelectors WHERE
participantName = 'All Consumers' and testName like '%overlapping 50% -
PERSISTENT%'
series.2.legend=Average latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
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}
+series.4.colourName=green
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,25 +20,32 @@
chartType=STATISTICAL_BAR
chartTitle=Latency, varying number of participants
chartSubtitle=Persistent 1KB messages
+chartDescription=1,2,5,10 P/Cs, persistent, auto-ack, with message payload 1KB.
+
xAxisTitle=Consumers
yAxisTitle=Latency (millis)
series.1.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM
Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and
testName like '% - 1 producer - PERSISTENT'
series.1.legend=1 producer
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM
Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and
testName like '% - 2 producers - PERSISTENT'
series.2.legend=2 producers
series.2.dir=${csvCurrentDir}
+series.2.colourName=green
series.3.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM
Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and
testName like '% - 5 producers - PERSISTENT'
series.3.legend=5 producers
series.3.dir=${csvCurrentDir}
+series.3.colourName=magenta
series.4.statement=SELECT totalNumberOfConsumers,
averageLatency,latencyStandardDeviation FROM
Latency-VaryingNumberOfParticipants WHERE participantName = 'All Consumers' and
testName like '% - 10 producers - PERSISTENT'
series.4.legend=10 producers
series.4.dir=${csvCurrentDir}
+series.4.colourName=red
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}
+series.5.colourName=dark_red
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=1388458&r1=1388457&r2=1388458&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
Fri Sep 21 12:34:44 2012
@@ -20,21 +20,27 @@
chartType=STATISTICAL_BAR
chartTitle=Latency on different queues
chartSubtitle=Persistent 1KB messages
+chartDescription=1P 1C, persistent, auto-ack with message payload 1KB. Sorted
queue - 400 random keys, Priority - 200 random priorities.
+
xAxisTitle=Queue type
yAxisTitle=Latency (millis)
series.1.statement=SELECT testName, maxLatency,0 FROM Latency-QueueTypes WHERE
participantName = 'All Consumers'
series.1.legend=Maximum latency
series.1.dir=${csvCurrentDir}
+series.1.colourName=blue
series.2.statement=SELECT testName, averageLatency,latencyStandardDeviation
FROM Latency-QueueTypes WHERE participantName = 'All Consumers'
series.2.legend=Average Latency
series.2.dir=${csvCurrentDir}
+series.2.colourName=red
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.3.colourName=dark_red
series.4.statement=SELECT testName, minLatency,0 FROM Latency-QueueTypes WHERE
participantName = 'All Consumers'
series.4.legend=Minimum latency
series.4.dir=${csvCurrentDir}
+series.4.colourName=green
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/BaseChartBuilder.java
Fri Sep 21 12:34:44 2012
@@ -52,11 +52,33 @@ public abstract class BaseChartBuilder i
}
if (seriesDefinition.getStrokeWidth() != null)
{
- stokeAndPaintAccessor.setSeriesStroke(i, new
BasicStroke(seriesDefinition.getStrokeWidth()));
+ // Negative width used to signify dashed
+ boolean dashed = seriesDefinition.getStrokeWidth() < 0;
+ float width = Math.abs(seriesDefinition.getStrokeWidth());
+ BasicStroke stroke = buildStrokeOfWidth(width, dashed);
+ stokeAndPaintAccessor.setSeriesStroke(i, stroke);
}
}
}
+ public abstract JFreeChart createChartImpl(String title, String xAxisTitle,
+ String yAxisTitle, final Dataset dataset, PlotOrientation
plotOrientation, boolean showLegend, boolean showToolTips,
+ boolean showUrls);
+
+ private BasicStroke buildStrokeOfWidth(float width, boolean dashed)
+ {
+ final BasicStroke stroke;
+ if (dashed)
+ {
+ stroke = new BasicStroke(width, BasicStroke.CAP_ROUND,
BasicStroke.JOIN_ROUND, 1.0f, new float[] {5.0f, 3.0f}, 0.0f);
+ }
+ else
+ {
+ stroke = new BasicStroke(width, BasicStroke.CAP_ROUND,
BasicStroke.JOIN_ROUND);
+ }
+ return stroke;
+ }
+
private void addSubtitle(JFreeChart chart, ChartingDefinition
chartingDefinition)
{
if (chartingDefinition.getChartSubtitle() != null)
@@ -70,8 +92,4 @@ public abstract class BaseChartBuilder i
chart.setBackgroundPaint(BLUE_GRADIENT);
}
- public abstract JFreeChart createChartImpl(String title, String xAxisTitle,
- String yAxisTitle, final Dataset dataset, PlotOrientation
plotOrientation, boolean showLegend, boolean showToolTips,
- boolean showUrls);
-
}
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/chartbuilder/StatisticalBarCharBuilder.java
Fri Sep 21 12:34:44 2012
@@ -20,7 +20,9 @@
*/
package org.apache.qpid.disttest.charting.chartbuilder;
+import java.awt.Color;
import java.awt.Font;
+import java.awt.Stroke;
import org.apache.qpid.disttest.charting.definition.ChartingDefinition;
import org.apache.qpid.disttest.charting.definition.SeriesDefinition;
@@ -84,12 +86,26 @@ public class StatisticalBarCharBuilder e
_seriesBuilder.build(chartingDefinition.getSeries());
- JFreeChart chart = createChartImpl(title, xAxisTitle, yAxisTitle,
dataset, PLOT_ORIENTATION, SHOW_LEGEND,
+ final JFreeChart chart = createChartImpl(title, xAxisTitle,
yAxisTitle, dataset, PLOT_ORIENTATION, SHOW_LEGEND,
SHOW_TOOL_TIPS, SHOW_URLS);
chart.getCategoryPlot().getDomainAxis().setCategoryLabelPositions(CategoryLabelPositions.UP_45);
addCommonChartAttributes(chart, chartingDefinition);
+ addSeriesAttributes(chartingDefinition.getSeries(), new
SeriesStokeAndPaintAccessor()
+ {
+ @Override
+ public void setSeriesStroke(int seriesIndex, Stroke stroke)
+ {
+
chart.getCategoryPlot().getRenderer().setSeriesStroke(seriesIndex, stroke);
+ }
+
+ @Override
+ public void setSeriesPaint(int seriesIndex, Color colour)
+ {
+
chart.getCategoryPlot().getRenderer().setSeriesPaint(seriesIndex, colour);
+ }
+ });
return chart;
}
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
Fri Sep 21 12:34:44 2012
@@ -118,8 +118,8 @@ public class ChartWriter
for (File chartFile : _chartFilesToChartDef.keySet())
{
ChartingDefinition def = _chartFilesToChartDef.get(chartFile);
- writer.write(" <a name='" + chartFile.getName() +
"'/>\n");
writer.write(" <figure>\n");
+ writer.write(" <a name='" + chartFile.getName() +
"'/>\n");
writer.write(" <img src='" + chartFile.getName() +
"'/>\n");
if (def.getChartDescription() != null)
{
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/ChartWriterTest.java
Fri Sep 21 12:34:44 2012
@@ -36,7 +36,6 @@ import org.apache.qpid.test.utils.TestFi
import org.apache.qpid.util.FileUtils;
import org.jfree.chart.ChartFactory;
import org.jfree.chart.JFreeChart;
-import org.jfree.chart.servlet.ChartDeleter;
import org.jfree.data.general.DefaultPieDataset;
public class ChartWriterTest extends TestCase
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html?rev=1388458&r1=1388457&r2=1388458&view=diff
==============================================================================
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
Fri Sep 21 12:34:44 2012
@@ -8,13 +8,13 @@
<li><a href='#chart1.png'>chart1.png</a></li>
<li><a href='#chart2.png'>chart2.png</a></li>
</ul>
- <a name='chart1.png'/>
<figure>
+ <a name='chart1.png'/>
<img src='chart1.png'/>
<figcaption>chart description1</figcaption>
</figure>
- <a name='chart2.png'/>
<figure>
+ <a name='chart2.png'/>
<img src='chart2.png'/>
</figure>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
