Merge in trunk changes from r758432:768028cmake

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

1 files changed, 0 insertions, 8 deletions

diff --git a/qpid/cpp/src/qpid/cluster/Multicaster.cpp b/qpid/cpp/src/qpid/cluster/Multicaster.cpp
index f0738ab08f..3b9d3ac990 100644
--- a/qpid/cpp/src/qpid/cluster/Multicaster.cpp
+++ b/qpid/cpp/src/qpid/cluster/Multicaster.cpp
@@ -22,7 +22,6 @@
 #include "Multicaster.h"
 #include "Cpg.h"
 #include "qpid/log/Statement.h"
-#include "qpid/sys/LatencyMetric.h"
 #include "qpid/framing/AMQBody.h"
 #include "qpid/framing/AMQFrame.h"
 
@@ -64,7 +63,6 @@ void Multicaster::mcast(const Event& e) {
             return;
         }
     }
-    QPID_LATENCY_INIT(e);
     queue.push(e);
 }
 
@@ -73,7 +71,6 @@ void Multicaster::sendMcast(PollableEventQueue::Queue& values) {
     try {
         PollableEventQueue::Queue::iterator i = values.begin();
         while( i != values.end()) {
-            QPID_LATENCY_RECORD("mcast send queue", *i);
             iovec iov = i->toIovec();
             if (!cpg.mcast(&iov, 1)) {
                 // cpg didn't send because of CPG flow control.
@@ -97,9 +94,4 @@ void Multicaster::release() {
     holdingQueue.clear();
 }
 
-void Multicaster::selfDeliver(const Event& e) {
-    sys::Mutex::ScopedLock l(lock);
-    QPID_LATENCY_RECORD("cpg self deliver", e);
-}
-
 }} // namespace qpid::cluster