You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2009/01/22 20:24:32 UTC
svn commit: r736752 - in /qpid/trunk/qpid/cpp/src/qpid: cluster/Cluster.cpp
cluster/EventFrame.h cluster/OutputInterceptor.cpp sys/LatencyMetric.cpp
sys/LatencyMetric.h
Author: aconway
Date: Thu Jan 22 11:24:31 2009
New Revision: 736752
URL: http://svn.apache.org/viewvc?rev=736752&view=rev
Log:
More latency metrics.
Modified:
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h
qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.h
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=736752&r1=736751&r2=736752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Thu Jan 22 11:24:31 2009
@@ -242,6 +242,7 @@
}
void Cluster::deliveredFrame(const EventFrame& e) {
+ QPID_LATENCY_RECORD("delivered frame queue", e.frame);
QPID_LOG(trace, *this << " DLVR: " << e.frame);
if (e.connection) {
e.connection->deliveredFrame(e);
@@ -252,6 +253,7 @@
if (!framing::invoke(dispatch, *e.frame.getBody()).wasHandled())
throw Exception(QPID_MSG("Invalid cluster control"));
}
+ QPID_LATENCY_RECORD("processed", e.frame);
}
struct AddrList {
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h?rev=736752&r1=736751&r2=736752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h Thu Jan 22 11:24:31 2009
@@ -24,6 +24,7 @@
#include "types.h"
#include "qpid/framing/AMQFrame.h"
+#include "qpid/sys/LatencyMetric.h"
#include <boost/intrusive_ptr.hpp>
namespace qpid {
@@ -38,7 +39,9 @@
{
// Connection event frame
EventFrame(const boost::intrusive_ptr<Connection>& c, const MemberId& m, const framing::AMQFrame& f, int rc=0)
- : connection(c), member(m), frame(f), readCredit(rc) {}
+ : connection(c), member(m), frame(f), readCredit(rc) {
+ QPID_LATENCY_INIT(frame);
+ }
bool isCluster() const { return !connection; }
bool isConnection() const { return connection; }
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp?rev=736752&r1=736751&r2=736752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.cpp Thu Jan 22 11:24:31 2009
@@ -46,7 +46,7 @@
}
if (!parent.isCatchUp())
sent += f.encodedSize();
- QPID_LATENCY_RECORD("on write queue", f);
+ QPID_LATENCY_RECORD("up to write queue", f);
}
void OutputInterceptor::activateOutput() {
@@ -79,6 +79,7 @@
//
void OutputInterceptor::deliverDoOutput(size_t requested) {
QPID_LATENCY_RECORD("deliver do-output", *this);
+ QPID_LATENCY_CLEAR(*this);
size_t buf = getBuffered();
if (parent.isLocal())
writeEstimate.delivered(requested, sent, buf); // Update the estimate.
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.cpp?rev=736752&r1=736751&r2=736752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.cpp Thu Jan 22 11:24:31 2009
@@ -32,6 +32,10 @@
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_)
{}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.h?rev=736752&r1=736751&r2=736752&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/LatencyMetric.h Thu Jan 22 11:24:31 2009
@@ -33,6 +33,7 @@
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 @@
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 @@
}}
#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 */
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org