Removed LatencyTracker from cluster.

Turned out not to be very useful. Better to use profiling tools like systemtap.


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

5 files changed, 5 insertions, 42 deletions

diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 60d580d6c7..d440068781 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -120,7 +120,6 @@
 #include "qpid/management/ManagementAgent.h"
 #include "qpid/memory.h"
 #include "qpid/sys/Thread.h"
-#include "qpid/sys/LatencyTracker.h"
 
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
@@ -328,20 +327,14 @@ void Cluster::deliver(
     MemberId from(nodeid, pid);
     framing::Buffer buf(static_cast<char*>(msg), msg_len);
     Event e(Event::decodeCopy(from, buf));
-    LATENCY_TRACK(if (e.getConnectionId().getMember() == self) mcast.cpgLatency.finish());
     deliverEvent(e);
 }
 
-LATENCY_TRACK(sys::LatencyTracker<const char*> eventQueueLatencyTracker("EventQueue");)
-    LATENCY_TRACK(sys::LatencyTracker<const AMQBody*> frameQueueLatencyTracker("FrameQueue");)
-
-    void Cluster::deliverEvent(const Event& e) {
-    LATENCY_TRACK(eventQueueLatencyTracker.start(e.getData());)
-        deliverEventQueue.push(e);
+void Cluster::deliverEvent(const Event& e) {
+    deliverEventQueue.push(e);
 }
 
 void Cluster::deliverFrame(const EventFrame& e) {
-    LATENCY_TRACK(frameQueueLatencyTracker.start(e.frame.getBody()));
     deliverFrameQueue.push(e);
 }
 
@@ -354,7 +347,6 @@ const ClusterUpdateOfferBody* castUpdateOffer(const framing::AMQBody* body) {
 // Handler for deliverEventQueue.
 // This thread decodes frames from events.
 void Cluster::deliveredEvent(const Event& e) {
-    LATENCY_TRACK(eventQueueLatencyTracker.finish(e.getData()));
     if (e.isCluster()) {
         QPID_LOG(trace, *this << " DLVR: " << e);
         EventFrame ef(e, e.getFrame());
@@ -400,13 +392,9 @@ void Cluster::flagError(
         error.error(connection, type, map.getFrameSeq(), map.getMembers(), msg);
 }
 
-LATENCY_TRACK(sys::LatencyTracker<const AMQBody*> doOutputTracker("DoOutput");)
-
 // Handler for deliverFrameQueue.
 // This thread executes the main logic.
-    void Cluster::deliveredFrame(const EventFrame& efConst) {
-    LATENCY_TRACK(frameQueueLatencyTracker.finish(e.frame.getBody()));
-    LATENCY_TRACK(if (e.frame.getBody()->type() == CONTENT_BODY) doOutputTracker.start(e.frame.getBody()));
+void Cluster::deliveredFrame(const EventFrame& efConst) {
     Mutex::ScopedLock l(lock);
     if (state == LEFT) return;
     EventFrame e(efConst);
@@ -438,7 +426,6 @@ void Cluster::processFrame(const EventFrame& e, Lock& l) {
             throw Exception(QPID_MSG("Invalid cluster control"));
     }
     else if (state >= CATCHUP) {
-        LATENCY_TRACK(LatencyScope ls(processLatency));
         map.incrementFrameSeq();
         ConnectionPtr connection = getConnection(e, l);
         if (connection) {
diff --git a/cpp/src/qpid/cluster/Event.cpp b/cpp/src/qpid/cluster/Event.cpp
index 30866d3154..4831e7eabe 100644
--- a/cpp/src/qpid/cluster/Event.cpp
+++ b/cpp/src/qpid/cluster/Event.cpp
@@ -38,9 +38,6 @@ const size_t EventHeader::HEADER_SIZE =
     sizeof(uint8_t) +  // type
     sizeof(uint64_t) + // connection pointer only, CPG provides member ID.
     sizeof(uint32_t)  // payload size
-#ifdef QPID_LATENCY_METRIC
-    + sizeof(int64_t)           // timestamp
-#endif
     ;
 
 EventHeader::EventHeader(EventType t, const ConnectionId& c,  size_t s)
@@ -61,9 +58,6 @@ void EventHeader::decode(const MemberId& m, framing::Buffer& buf) {
         throw Exception("Invalid multicast event type");
     connectionId = ConnectionId(m, buf.getLongLong());
     size = buf.getLong();
-#ifdef QPID_LATENCY_METRIC
-    latency_metric_timestamp = buf.getLongLong();
-#endif
 }
 
 Event Event::decodeCopy(const MemberId& m, framing::Buffer& buf) {
@@ -97,9 +91,6 @@ void EventHeader::encode(Buffer& b) const {
     b.putOctet(type);
     b.putLongLong(connectionId.getNumber());
     b.putLong(size);
-#ifdef QPID_LATENCY_METRIC
-    b.putLongLong(latency_metric_timestamp);
-#endif
 }
 
 // Encode my header in my buffer.
diff --git a/cpp/src/qpid/cluster/Multicaster.cpp b/cpp/src/qpid/cluster/Multicaster.cpp
index 7e97963318..72fc1533f8 100644
--- a/cpp/src/qpid/cluster/Multicaster.cpp
+++ b/cpp/src/qpid/cluster/Multicaster.cpp
@@ -31,9 +31,6 @@ namespace cluster {
 Multicaster::Multicaster(Cpg& cpg_, 
                          const boost::shared_ptr<sys::Poller>& poller,
                          boost::function<void()> onError_) :
-#if defined (QPID_LATENCY_TRACKER)
-    cpgLatency("CPG"),
-#endif
     onError(onError_), cpg(cpg_), 
     queue(boost::bind(&Multicaster::sendMcast, this, _1), poller),
     holding(true)
@@ -61,7 +58,6 @@ void Multicaster::mcastBuffer(const char* data, size_t size, const ConnectionId&
 void Multicaster::mcast(const Event& e) {
     {
         sys::Mutex::ScopedLock l(lock);
-        LATENCY_TRACK(cpgLatency.start());
         if (e.isConnection() && holding) {
             holdingQueue.push_back(e); 
             return;
diff --git a/cpp/src/qpid/cluster/Multicaster.h b/cpp/src/qpid/cluster/Multicaster.h
index f2ee5099bb..c1a0ddffc6 100644
--- a/cpp/src/qpid/cluster/Multicaster.h
+++ b/cpp/src/qpid/cluster/Multicaster.h
@@ -26,7 +26,6 @@
 #include "qpid/cluster/Event.h"
 #include "qpid/sys/PollableQueue.h"
 #include "qpid/sys/Mutex.h"
-#include "qpid/sys/LatencyTracker.h"
 #include <boost/shared_ptr.hpp>
 #include <deque>
 
@@ -58,8 +57,6 @@ class Multicaster
     /** End holding mode, held events are mcast */
     void release();
     
-    LATENCY_TRACK(sys::LatencyCounter cpgLatency;)
-    
   private:
     typedef sys::PollableQueue<Event> PollableEventQueue;
     typedef std::deque<Event> PlainEventQueue;
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/cpp/src/qpid/cluster/OutputInterceptor.cpp
index cb8f01386c..cb75fe5561 100644
--- a/cpp/src/qpid/cluster/OutputInterceptor.cpp
+++ b/cpp/src/qpid/cluster/OutputInterceptor.cpp
@@ -24,7 +24,6 @@
 #include "qpid/framing/ClusterConnectionDeliverDoOutputBody.h"
 #include "qpid/framing/AMQFrame.h"
 #include "qpid/log/Statement.h"
-#include "qpid/sys/LatencyTracker.h"
 #include <boost/current_function.hpp>
 
 
@@ -40,16 +39,9 @@ OutputInterceptor::OutputInterceptor(Connection& p, sys::ConnectionOutputHandler
     : parent(p), closing(false), next(&h), sendMax(1), sent(0), sentDoOutput(false)
 {}
 
-#if defined QPID_LATENCY_TRACKER
-extern sys::LatencyTracker<const AMQBody*> doOutputTracker;
-#endif
-
 void OutputInterceptor::send(framing::AMQFrame& f) {
-    LATENCY_TRACK(doOutputTracker.finish(f.getBody()));
-    {
-        sys::Mutex::ScopedLock l(lock);
-        next->send(f);
-    }
+    sys::Mutex::ScopedLock l(lock);
+    next->send(f);
 }
 
 void OutputInterceptor::activateOutput() {