2 files changed, 12 insertions, 1 deletions
diff --git a/cpp/src/qpid/sys/LatencyMetric.cpp b/cpp/src/qpid/sys/LatencyMetric.cpp
index 6a52425706..caa221def4 100644
--- a/cpp/src/qpid/sys/LatencyMetric.cpp
+++ b/cpp/src/qpid/sys/LatencyMetric.cpp
@@ -32,6 +32,10 @@ void LatencyMetricTimestamp::initialize(const LatencyMetricTimestamp& ts) {
     const_cast<int64_t&>(ts.latency_metric_timestamp) = Duration(now());
 }
 
+void LatencyMetricTimestamp::clear(const LatencyMetricTimestamp& ts) {
+    const_cast<int64_t&>(ts.latency_metric_timestamp) = 0;
+}
+
 LatencyMetric::LatencyMetric(const char* msg, int64_t skip_) : 
     message(msg), count(0), total(0), skipped(0), skip(skip_)
 {}
diff --git a/cpp/src/qpid/sys/LatencyMetric.h b/cpp/src/qpid/sys/LatencyMetric.h
index ff679ef6a8..63b5020db4 100644
--- a/cpp/src/qpid/sys/LatencyMetric.h
+++ b/cpp/src/qpid/sys/LatencyMetric.h
@@ -33,6 +33,7 @@ namespace sys {
 struct LatencyMetricTimestamp {
     LatencyMetricTimestamp() : latency_metric_timestamp(0) {}
     static void initialize(const LatencyMetricTimestamp&);
+    static void clear(const LatencyMetricTimestamp&);
     int64_t latency_metric_timestamp;
 };
     
@@ -53,15 +54,19 @@ class LatencyMetric {
   private:
     void report();
     const char* message;
-    int64_t ignore, count, total, skipped, skip;
+    int64_t count, total, skipped, skip;
 };
 
 }} // namespace qpid::sys
 
 #define QPID_LATENCY_INIT(x) ::qpid::sys::LatencyMetricTimestamp::initialize(x)
+#define QPID_LATENCY_CLEAR(x) ::qpid::sys::LatencyMetricTimestamp::clear(x)
 #define QPID_LATENCY_RECORD(msg, x) do {                                 \
         static ::qpid::sys::LatencyMetric metric__(msg); metric__.record(x); \
     } while (false)
+#define QPID_LATENCY_RECORD_SKIP(msg, x, skip) do {                          \
+        static ::qpid::sys::LatencyMetric metric__(msg, skip); metric__.record(x); \
+    } while (false)
 
 
 #else  /* defined QPID_LATENCY_METRIC */
@@ -71,7 +76,9 @@ class LatencyMetricTimestamp {};
 }}
 
 #define QPID_LATENCY_INIT(x) (void)x
+#define QPID_LATENCY_CLEAR(x) (void)x
 #define QPID_LATENCY_RECORD(msg, x) (void)x
+#define QPID_LATENCY_RECORD_SKIP(msg, x, skip) (void)x
 
 #endif /* defined QPID_LATENCY_METRIC */