Author: aco
Date: Mon Jun 12 07:33:27 2006
New Revision: 413666
URL: http://svn.apache.org/viewvc?rev=413666&view=rev
Log:
- Remove the property consumer.consumerName, since this has been replaced by
consumer.clientName
- Shortened the default name of the xml file.
- Added additional summary information.
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java?rev=413666&r1=413665&r2=413666&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerClient.java
Mon Jun 12 07:33:27 2006
@@ -36,7 +36,6 @@
protected boolean durable = false;
protected boolean asyncRecv = true;
- protected String consumerName = "TestConsumerClient";
protected long recvCount = 1000000; // Receive a million messages by
default
protected long recvDuration = 5 * 60 * 1000; // Receive for 5 mins by
default
@@ -151,7 +150,11 @@
public MessageConsumer createJmsConsumer(Destination dest) throws
JMSException {
if (isDurable()) {
- jmsConsumer = getSession().createDurableSubscriber((Topic) dest,
getConsumerName());
+ String clientName = getClientName();
+ if (clientName == null) {
+ clientName = "JmsConsumer";
+ }
+ jmsConsumer = getSession().createDurableSubscriber((Topic) dest,
clientName);
} else {
jmsConsumer = getSession().createConsumer(dest);
}
@@ -160,7 +163,11 @@
public MessageConsumer createJmsConsumer(Destination dest, String
selector, boolean noLocal) throws JMSException {
if (isDurable()) {
- jmsConsumer = getSession().createDurableSubscriber((Topic) dest,
getConsumerName(), selector, noLocal);
+ String clientName = getClientName();
+ if (clientName == null) {
+ clientName = "JmsConsumer";
+ }
+ jmsConsumer = getSession().createDurableSubscriber((Topic) dest,
clientName, selector, noLocal);
} else {
jmsConsumer = getSession().createConsumer(dest, selector, noLocal);
}
@@ -194,14 +201,6 @@
public void setAsyncRecv(boolean asyncRecv) {
this.asyncRecv = asyncRecv;
- }
-
- public String getConsumerName() {
- return consumerName;
- }
-
- public void setConsumerName(String consumerName) {
- this.consumerName = consumerName;
}
public long getRecvCount() {
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java?rev=413666&r1=413665&r2=413666&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsConsumerSystem.java
Mon Jun 12 07:33:27 2006
@@ -23,7 +23,7 @@
public String getReportName() {
if (reportName == null) {
- return "JmsConsumer_ClientCount" + getNumClients() + "_DestCount"
+ getTotalDests() + "_" + getDestDistro() + ".xml";
+ return "JmsConsumer_Client" + getNumClients() + "_Dest" +
getTotalDests() + "_" + getDestDistro() + ".xml";
} else {
return reportName;
}
@@ -42,7 +42,6 @@
JmsConsumerClient consumer = new JmsConsumerClient();
consumer.setSettings(clientSettings);
- consumer.setConsumerName(clientName); // For durable subscribers
consumer.setClientName(clientName);
if (sampler != null) {
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java?rev=413666&r1=413665&r2=413666&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/JmsProducerSystem.java
Mon Jun 12 07:33:27 2006
@@ -23,7 +23,7 @@
public String getReportName() {
if (reportName == null) {
- return "JmsProducer_ClientCount" + getNumClients() + "_DestCount"
+ getTotalDests() + "_" + getDestDistro() + ".xml";
+ return "JmsProducer_Client" + getNumClients() + "_Dest" +
getTotalDests() + "_" + getDestDistro() + ".xml";
} else {
return reportName;
}
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java?rev=413666&r1=413665&r2=413666&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/AbstractPerfReportWriter.java
Mon Jun 12 07:33:27 2006
@@ -28,10 +28,12 @@
import java.util.Iterator;
public abstract class AbstractPerfReportWriter implements
PerformanceReportWriter {
- public static final String KEY_SYS_TOTAL_TP = "SystemTotalTP";
- public static final String KEY_SYS_TOTAL_CLIENTS = "SystemTotalClients";
- public static final String KEY_SYS_AVE_TP = "SystemAveTP";
- public static final String KEY_SYS_AVE_EMM_TP = "SystemAveEMMTP";
+ public static final String KEY_SYS_TOTAL_TP = "SystemTotalTP";
+ public static final String KEY_SYS_TOTAL_CLIENTS =
"SystemTotalClients";
+ public static final String KEY_SYS_AVE_TP = "SystemAveTP";
+ public static final String KEY_SYS_AVE_EMM_TP = "SystemAveEMMTP";
+ public static final String KEY_SYS_AVE_CLIENT_TP = "SystemAveClientTP";
+ public static final String KEY_SYS_AVE_CLIENT_EMM_TP =
"SystemAveClientEMMTP";
public static final String KEY_MIN_CLIENT_TP = "MinClientTP";
public static final String KEY_MAX_CLIENT_TP = "MaxClientTP";
public static final String KEY_MIN_CLIENT_TOTAL_TP = "MinClientTotalTP";
@@ -175,6 +177,8 @@
summary.put(KEY_SYS_TOTAL_CLIENTS, String.valueOf(clientCount));
summary.put(KEY_SYS_AVE_TP, String.valueOf(systemAveTP));
summary.put(KEY_SYS_AVE_EMM_TP, String.valueOf(systemAveEMMTP));
+ summary.put(KEY_SYS_AVE_CLIENT_TP, String.valueOf(systemAveTP /
clientCount));
+ summary.put(KEY_SYS_AVE_CLIENT_EMM_TP, String.valueOf(systemAveEMMTP /
clientCount));
summary.put(KEY_MIN_CLIENT_TP, nameMinClientTP + "=" + minClientTP);
summary.put(KEY_MAX_CLIENT_TP, nameMaxClientTP + "=" + maxClientTP);
summary.put(KEY_MIN_CLIENT_TOTAL_TP, nameMinClientTotalTP + "=" +
minClientTotalTP);
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java?rev=413666&r1=413665&r2=413666&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/VerbosePerfReportWriter.java
Mon Jun 12 07:33:27 2006
@@ -72,6 +72,8 @@
System.out.println("[PERF-SUMMARY] System Total Clients: " +
summary.get(KEY_SYS_TOTAL_CLIENTS));
System.out.println("[PERF-SUMMARY] System Average Throughput: " +
summary.get(KEY_SYS_AVE_TP));
System.out.println("[PERF-SUMMARY] System Average Throughput Excluding
Min/Max: " + summary.get(KEY_SYS_AVE_EMM_TP));
+ System.out.println("[PERF-SUMMARY] System Average Client Throughput: "
+ summary.get(KEY_SYS_AVE_CLIENT_TP));
+ System.out.println("[PERF-SUMMARY] System Average Client Throughput
Excluding Min/Max: " + summary.get(KEY_SYS_AVE_CLIENT_EMM_TP));
System.out.println("[PERF-SUMMARY] Min Client Throughput Per Sample: "
+ summary.get(KEY_MIN_CLIENT_TP));
System.out.println("[PERF-SUMMARY] Max Client Throughput Per Sample: "
+ summary.get(KEY_MAX_CLIENT_TP));
System.out.println("[PERF-SUMMARY] Min Client Total Throughput: " +
summary.get(KEY_MIN_CLIENT_TOTAL_TP));
Modified:
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java?rev=413666&r1=413665&r2=413666&view=diff
==============================================================================
---
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
(original)
+++
incubator/activemq/trunk/tooling/maven-activemq-perf-plugin/src/main/java/org/apache/activemq/tool/reports/XmlFilePerfReportWriter.java
Mon Jun 12 07:33:27 2006
@@ -223,6 +223,14 @@
System.out.println("System Average Throughput Excluding Min/Max: " +
val);
xmlFileWriter.println("<prop key='" + KEY_SYS_AVE_EMM_TP + "'>" + val
+ "</prop>");
+ val = (String)summary.get(KEY_SYS_AVE_CLIENT_TP);
+ System.out.println("System Average Client Throughput: " + val);
+ xmlFileWriter.println("<prop key='" + KEY_SYS_AVE_CLIENT_TP + "'>" +
val + "</prop>");
+
+ val = (String)summary.get(KEY_SYS_AVE_CLIENT_EMM_TP);
+ System.out.println("System Average Client Throughput Excluding
Min/Max: " + val);
+ xmlFileWriter.println("<prop key='" + KEY_SYS_AVE_CLIENT_EMM_TP + "'>"
+ val + "</prop>");
+
val = (String)summary.get(KEY_MIN_CLIENT_TP);
clientName = val.substring(0, val.indexOf("="));
clientVal = val.substring(val.indexOf("=") + 1);
