diff options
| author | Alan Conway <aconway@apache.org> | 2007-07-19 21:52:24 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-07-19 21:52:24 +0000 |
| commit | cb566519d58ded6704507fa5530bf901e620edf6 (patch) | |
| tree | ab4b29ddd0ad2b5e9015647e379bede84163b13e /cpp/src/tests/Cluster.h | |
| parent | 3f900af77d5f781431dc25e307974e0fc27aa561 (diff) | |
| download | qpid-python-cb566519d58ded6704507fa5530bf901e620edf6.tar.gz | |
* 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
Diffstat (limited to 'cpp/src/tests/Cluster.h')
| -rw-r--r-- | cpp/src/tests/Cluster.h | 10 |
1 files changed, 6 insertions, 4 deletions
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 <boost/bind.hpp> +#include <boost/test/test_tools.hpp> + #include <iostream> #include <vector> #include <functional> @@ -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<size_t>(), bind(&Cluster::size,this), n)); } |