summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2007-11-13 04:41:57 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2007-11-13 04:41:57 +0000
commitb3982f379ba0d7f889da7c9ea9068f9d1435aafc (patch)
treea7f614afcd748e75d54c709eb3489c26d086d88c
parentb4a562164bfbf627c9bf9e802ea2baa33d12521a (diff)
downloadqpid-python-b3982f379ba0d7f889da7c9ea9068f9d1435aafc.tar.gz
Fixed errors in the calculation
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@594429 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java7
-rw-r--r--java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java1
-rw-r--r--java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java4
-rw-r--r--java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java4
4 files changed, 9 insertions, 7 deletions
diff --git a/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java b/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java
index 6b6a8a509c..635fcaa248 100644
--- a/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSConsumer.java
+++ b/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/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java b/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java
index c9c5b2b308..60913795ba 100644
--- a/java/perftests/src/main/java/org/apache/qpid/client/perf/JMSProducer.java
+++ b/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/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java b/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java
index e220aec9e1..99659fed44 100644
--- a/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageConsumerTest.java
+++ b/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/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java b/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java
index 794031f346..b0ea28292d 100644
--- a/java/perftests/src/main/java/org/apache/qpid/client/perf/MessageProducerTest.java
+++ b/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 : ");