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/04/15 19:45:48 UTC
svn commit: r765285 - in /qpid/trunk/qpid/cpp/src/qpid: client/ cluster/
framing/ sys/
Author: aconway
Date: Wed Apr 15 17:45:45 2009
New Revision: 765285
URL: http://svn.apache.org/viewvc?rev=765285&view=rev
Log:
Cleaned up some un-necessary #include dependencies.
Removed un-used LatencyMetric hack.
Removed:
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/client/Completion.h
qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp
qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.h
qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp
qpid/trunk/qpid/cpp/src/qpid/client/Future.h
qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp
qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/Event.h
qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h
qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.h
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h
qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Completion.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Completion.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Completion.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Completion.h Wed Apr 15 17:45:45 2009
@@ -24,11 +24,12 @@
#include <boost/shared_ptr.hpp>
#include "Future.h"
-#include "SessionImpl.h"
namespace qpid {
namespace client {
+class SessionImpl;
+
/**
* Asynchronous commands that do not return a result will return a
* Completion. You can use the completion to wait for that specific
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connection.cpp Wed Apr 15 17:45:45 2009
@@ -19,6 +19,7 @@
*
*/
#include "Connection.h"
+#include "ConnectionImpl.h"
#include "ConnectionSettings.h"
#include "Message.h"
#include "SessionImpl.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connection.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connection.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connection.h Wed Apr 15 17:45:45 2009
@@ -25,6 +25,7 @@
#include <string>
#include "qpid/client/Session.h"
#include "qpid/client/ClientImportExport.h"
+#include "qpid/client/ConnectionSettings.h"
namespace qpid {
@@ -32,7 +33,6 @@
namespace client {
-struct ConnectionSettings;
class ConnectionImpl;
/**
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.cpp Wed Apr 15 17:45:45 2009
@@ -49,6 +49,9 @@
session.getExecution().getDemux().get(q);
}
+Dispatcher::~Dispatcher() {}
+
+
void Dispatcher::start()
{
worker = Thread(this);
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Dispatcher.h Wed Apr 15 17:45:45 2009
@@ -30,7 +30,6 @@
#include "qpid/sys/Runnable.h"
#include "qpid/sys/Thread.h"
#include "MessageListener.h"
-#include "SubscriptionImpl.h"
namespace qpid {
namespace client {
@@ -61,6 +60,7 @@
public:
Dispatcher(const Session& session, const std::string& queue = "");
+ ~Dispatcher();
void start();
void wait();
Modified: qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.cpp Wed Apr 15 17:45:45 2009
@@ -20,6 +20,9 @@
*/
#include "FailoverListener.h"
#include "SessionBase_0_10Access.h"
+#include "qpid/client/SessionImpl.h"
+#include "qpid/client/ConnectionImpl.h"
+#include "qpid/client/SubscriptionImpl.h"
#include "qpid/client/SubscriptionManager.h"
#include "qpid/framing/Uuid.h"
#include "qpid/log/Statement.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/FailoverListener.h Wed Apr 15 17:45:45 2009
@@ -33,6 +33,7 @@
namespace client {
class SubscriptionManager;
+class ConnectionImpl;
/**
* @internal Listen for failover updates from the amq.failover exchange.
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Future.cpp Wed Apr 15 17:45:45 2009
@@ -20,6 +20,7 @@
*/
#include "Future.h"
+#include "SessionImpl.h"
namespace qpid {
namespace client {
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Future.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Future.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Future.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Future.h Wed Apr 15 17:45:45 2009
@@ -29,7 +29,6 @@
#include "qpid/framing/StructHelper.h"
#include "FutureCompletion.h"
#include "FutureResult.h"
-#include "SessionImpl.h"
#include "ClientImportExport.h"
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/LocalQueue.cpp Wed Apr 15 17:45:45 2009
@@ -21,6 +21,7 @@
#include "LocalQueue.h"
#include "qpid/Exception.h"
#include "qpid/framing/FrameSet.h"
+#include "qpid/framing/MessageTransferBody.h"
#include "qpid/framing/reply_exceptions.h"
#include "HandlePrivate.h"
#include "SubscriptionImpl.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.cpp Wed Apr 15 17:45:45 2009
@@ -20,6 +20,7 @@
*/
#include "SessionBase_0_10.h"
#include "Connection.h"
+#include "qpid/client/SessionImpl.h"
#include "qpid/framing/all_method_bodies.h"
namespace qpid {
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SessionBase_0_10.h Wed Apr 15 17:45:45 2009
@@ -28,9 +28,7 @@
#include "qpid/framing/MethodContent.h"
#include "qpid/framing/TransferContent.h"
#include "qpid/client/Completion.h"
-#include "qpid/client/ConnectionImpl.h"
#include "qpid/client/Execution.h"
-#include "qpid/client/SessionImpl.h"
#include "qpid/client/TypedResult.h"
#include "qpid/shared_ptr.h"
#include "qpid/client/ClientImportExport.h"
@@ -62,7 +60,7 @@
*/
class SessionBase_0_10 {
public:
-
+
typedef framing::TransferContent DefaultContent;
///@internal
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=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.cpp Wed Apr 15 17:45:45 2009
@@ -47,7 +47,6 @@
#include "qpid/management/ManagementBroker.h"
#include "qpid/memory.h"
#include "qpid/shared_ptr.h"
-#include "qpid/sys/LatencyMetric.h"
#include "qpid/sys/Thread.h"
#include <boost/bind.hpp>
@@ -227,8 +226,6 @@
MemberId from(nodeid, pid);
framing::Buffer buf(static_cast<char*>(msg), msg_len);
Event e(Event::decodeCopy(from, buf));
- if (from == self) // Record self-deliveries for flow control.
- mcast.selfDeliver(e);
deliverEvent(e);
}
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Connection.cpp Wed Apr 15 17:45:45 2009
@@ -39,8 +39,6 @@
#include "qpid/framing/ConnectionCloseBody.h"
#include "qpid/framing/ConnectionCloseOkBody.h"
#include "qpid/log/Statement.h"
-#include "qpid/sys/LatencyMetric.h"
-#include "qpid/sys/AtomicValue.h"
#include <boost/current_function.hpp>
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Event.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Event.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Event.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Event.h Wed Apr 15 17:45:45 2009
@@ -25,7 +25,6 @@
#include "types.h"
#include "qpid/RefCountedBuffer.h"
#include "qpid/framing/AMQFrame.h"
-#include "qpid/sys/LatencyMetric.h"
#include <sys/uio.h> // For iovec
#include <iosfwd>
@@ -42,7 +41,7 @@
namespace cluster {
/** Header data for a multicast event */
-class EventHeader : public ::qpid::sys::LatencyMetricTimestamp {
+class EventHeader {
public:
EventHeader(EventType t=DATA, const ConnectionId& c=ConnectionId(), size_t size=0);
void decode(const MemberId& m, framing::Buffer&);
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=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/EventFrame.h Wed Apr 15 17:45:45 2009
@@ -25,7 +25,6 @@
#include "types.h"
#include "Event.h"
#include "qpid/framing/AMQFrame.h"
-#include "qpid/sys/LatencyMetric.h"
#include <boost/intrusive_ptr.hpp>
#include <iosfwd>
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/Multicaster.cpp Wed Apr 15 17:45:45 2009
@@ -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 @@
return;
}
}
- QPID_LATENCY_INIT(e);
queue.push(e);
}
@@ -73,7 +71,6 @@
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 @@
holdingQueue.clear();
}
-void Multicaster::selfDeliver(const Event& e) {
- sys::Mutex::ScopedLock l(lock);
- QPID_LATENCY_RECORD("cpg self deliver", e);
-}
-
}} // namespace qpid::cluster
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/OutputInterceptor.h Wed Apr 15 17:45:45 2009
@@ -26,7 +26,6 @@
#include "NoOpConnectionOutputHandler.h"
#include "qpid/sys/ConnectionOutputHandler.h"
#include "qpid/broker/ConnectionFactory.h"
-#include "qpid/sys/LatencyMetric.h"
#include <boost/function.hpp>
namespace qpid {
@@ -38,7 +37,7 @@
/**
* Interceptor for connection OutputHandler, manages outgoing message replication.
*/
-class OutputInterceptor : public sys::ConnectionOutputHandler, sys::LatencyMetricTimestamp {
+class OutputInterceptor : public sys::ConnectionOutputHandler {
public:
OutputInterceptor(cluster::Connection& p, sys::ConnectionOutputHandler& h);
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.cpp Wed Apr 15 17:45:45 2009
@@ -26,6 +26,8 @@
#include "ExpiryPolicy.h"
#include "qpid/client/SessionBase_0_10Access.h"
#include "qpid/client/ConnectionAccess.h"
+#include "qpid/client/SessionImpl.h"
+#include "qpid/client/ConnectionImpl.h"
#include "qpid/broker/Broker.h"
#include "qpid/broker/Queue.h"
#include "qpid/broker/QueueRegistry.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/cluster/UpdateClient.h Wed Apr 15 17:45:45 2009
@@ -24,6 +24,7 @@
#include "ClusterMap.h"
#include "qpid/client/Connection.h"
+#include "qpid/client/ConnectionSettings.h"
#include "qpid/client/AsyncSession.h"
#include "qpid/broker/SemanticState.h"
#include "qpid/sys/Runnable.h"
Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h?rev=765285&r1=765284&r2=765285&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h Wed Apr 15 17:45:45 2009
@@ -26,7 +26,6 @@
#include "AMQContentBody.h"
#include "AMQHeartbeatBody.h"
#include "ProtocolVersion.h"
-#include "qpid/sys/LatencyMetric.h"
#include <boost/intrusive_ptr.hpp>
#include <boost/cast.hpp>
#include "qpid/CommonImportExport.h"
@@ -34,7 +33,7 @@
namespace qpid {
namespace framing {
-class AMQFrame : public AMQDataBlock, public sys::LatencyMetricTimestamp
+class AMQFrame : public AMQDataBlock
{
public:
QPID_COMMON_EXTERN AMQFrame(const boost::intrusive_ptr<AMQBody>& b=0);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org