From cb566519d58ded6704507fa5530bf901e620edf6 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 19 Jul 2007 21:52:24 +0000 Subject: * Summary: - Connect cluster handlers into broker handler chains. - Progress on wiring replication. * src/tests/cluster.mk: Temporarily disabled Cluster test. * src/tests/Cluster.h, cpp, Cluster_child.cpp: Updated to use UUIDs. * src/qpidd.cpp: - Load optional libs (cluster) - Include plugin config in options.parse. * src/qpid/cluster/SessionManager.h: - Create sessions, update handler chains (as HandlerUpdater) - Handle frames from cluster. * src/qpid/cluster/ClusterPlugin.h, .cpp: - renamed from ClusterPluginProvider - Create and connect Cluster and SessionManager. - Register SessionManager as HandlerUpdater. * src/qpid/cluster/Cluster.h, .cpp: Refactor as SessionFrameHandler. * src/qpid/broker/Connection.cpp: Apply HandlerUpdaters. * src/qpid/broker/Broker.h, .cpp: - Initialize plugins - Apply HandlerUpdaters * src/qpid/Plugin.h, .cpp: Simplified plugin framework. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@557788 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/Cluster.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'cpp/src/tests/Cluster.h') diff --git a/cpp/src/tests/Cluster.h b/cpp/src/tests/Cluster.h index 8fddd1d1f7..bf6d1c2a64 100644 --- a/cpp/src/tests/Cluster.h +++ b/cpp/src/tests/Cluster.h @@ -24,7 +24,10 @@ #include "qpid/framing/ChannelOkBody.h" #include "qpid/framing/BasicGetOkBody.h" #include "qpid/log/Logger.h" + #include +#include + #include #include #include @@ -69,13 +72,12 @@ void nullDeleter(void*) {} struct TestCluster : public Cluster { - TestCluster(string name, string url) : Cluster(name, url) - { - setReceivedChain(make_shared_ptr(&received, nullDeleter)); - } + TestCluster(string name, string url) + : Cluster(name, url, make_shared_ptr(&received, nullDeleter)) {} /** Wait for cluster to be of size n. */ bool waitFor(size_t n) { + BOOST_CHECKPOINT("About to call Cluster::wait"); return wait(boost::bind(equal_to(), bind(&Cluster::size,this), n)); } -- cgit v1.2.1