From 20f5e0b2504bddaecb396f602e0a8a618a525ea9 Mon Sep 17 00:00:00 2001 From: Rajith Muditha Attapattu Date: Tue, 13 Nov 2007 04:41:57 +0000 Subject: Fixed errors in the calculation git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@594429 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/client/perf/JMSConsumer.java | 7 ++++--- .../src/main/java/org/apache/qpid/client/perf/JMSProducer.java | 1 + .../main/java/org/apache/qpid/client/perf/MessageConsumerTest.java | 4 ++-- .../main/java/org/apache/qpid/client/perf/MessageProducerTest.java | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java index 6b6a8a509c..635fcaa248 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java @@ -57,10 +57,10 @@ public class JMSConsumer implements Runnable if (msg != null) { long msgId = Integer.parseInt(msg.getJMSCorrelationID()); - if (_currentMsgCount+1 != msgId) + /*if (_currentMsgCount+1 != msgId) { - _logger.error("Error : Message received out of order in JMSConsumer:" + _id + " message id was " + msgId); - } + _logger.error("Error : Message received out of order in JMSConsumer:" + _id + " message id was " + msgId + " expected: " + _currentMsgCount+1); + }*/ _currentMsgCount ++; } } @@ -83,6 +83,7 @@ public class JMSConsumer implements Runnable public void stopConsuming() { _run.set(false); + System.out.println("Producer received notification to stop"); } public String getId() diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java index c9c5b2b308..60913795ba 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java @@ -78,6 +78,7 @@ public class JMSProducer implements Runnable public void stopProducing() { _run.set(false); + System.out.println("Producer received notification to stop"); } public String getId() diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java index e220aec9e1..99659fed44 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java @@ -124,9 +124,9 @@ public class MessageConsumerTest extends Options implements Runnable _memoryLog.close(); if (printSummary) { - double totaltime = (d.getTime() - _startTime)*1000; // trying to get a per sec rate + double totaltime = d.getTime() - _startTime; double dCount = totalMsgCount; - double ratio = dCount/totaltime; + double ratio = (dCount/totaltime)*1000; FileWriter _summaryLog = new FileWriter(_logFileName + "_Summary",true); buf = new StringBuffer("MessageConsumerTest \n Test started at : "); buf.append(df.format(new Date(_startTime))).append("\n Test finished at : "); diff --git a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java index 794031f346..b0ea28292d 100644 --- a/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java +++ b/qpid/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java @@ -121,9 +121,9 @@ public class MessageProducerTest extends Options implements Runnable _memoryLog.close(); if (printSummary) { - double totaltime = (d.getTime() - _startTime)*1000; // trying to get a per sec rate + double totaltime = d.getTime() - _startTime; double dCount = totalMsgCount; - double ratio = dCount/totaltime; + double ratio = (dCount/totaltime)*1000; FileWriter _summaryLog = new FileWriter(_logFileName + "_Summary",true); buf = new StringBuffer("MessageProducerTest \n Test started at : "); buf.append(df.format(new Date(_startTime))).append("\n Test finished at : "); -- cgit v1.2.1