Count latency samples, don't assume all messages are latency samples.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@936336 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 7 insertions, 4 deletions

diff --git a/cpp/src/tests/Statistics.cpp b/cpp/src/tests/Statistics.cpp
index a3852e64af..c002bc6a6a 100644
--- a/cpp/src/tests/Statistics.cpp
+++ b/cpp/src/tests/Statistics.cpp
@@ -52,13 +52,15 @@ void Throughput::report(ostream& o) const {
 ThroughputAndLatency::ThroughputAndLatency() :
     total(0),
     min(numeric_limits<double>::max()),
-    max(numeric_limits<double>::min())
+    max(numeric_limits<double>::min()),
+    samples(0)
 {}
 
 void ThroughputAndLatency::message(const messaging::Message& m) {
     Throughput::message(m);
     types::Variant::Map::const_iterator i = m.getProperties().find("ts");
     if (i != m.getProperties().end()) {
+        ++samples;
         int64_t start(i->second.asInt64());
         int64_t end(sys::Duration(sys::EPOCH, sys::now()));
         double latency = double(end - start)/sys::TIME_MSEC;
@@ -77,11 +79,12 @@ void ThroughputAndLatency::header(ostream& o) const {
 
 void ThroughputAndLatency::report(ostream& o) const {
     Throughput::report(o);
-    if (messages)
+    if (samples) {
         o << fixed << setprecision(2)
-          << '\t' << min << '\t'  << max << '\t' << total/messages;
+          << '\t' << min << '\t'  << max << '\t' << total/samples;
+    }
     else
-        o << "\t<0 messages, can't compute latency>";
+        o << "\t[No latency samples]";
 }
 
 ReporterBase::ReporterBase(ostream& o, int batch, bool wantHeader)