diff options
author | Alan Conway <aconway@apache.org> | 2011-07-28 21:38:06 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2011-07-28 21:38:06 +0000 |
commit | c42d9df9b8af5dc7d5decdcb5818a100ee8df0a3 (patch) | |
tree | f8c01686d457d1eef2b3fd0d6a5bc67887728ec5 /qpid/cpp/src/qpid/cluster/exp/Core.h | |
parent | 05220525f1591fe8052f17ec67f810751bd5fc71 (diff) | |
download | qpid-python-c42d9df9b8af5dc7d5decdcb5818a100ee8df0a3.tar.gz |
QPID-2920: Broken checkpoint: passing dequeue mutex test with issues
- handler/context/replica convention (see overview.h doc notes)
- rename BrokerHandler to BrokerContext
- notify Cluster (BrokerContext) on queue stopped or empty (need empty?)
- Implementing Stoppable & stoppable scopes in Queue.cpp
- Move queue ownership logic from dequeue to acquire
Releasing on message count will not work, switch to timer based release.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2920@1152008 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/cluster/exp/Core.h')
-rw-r--r-- | qpid/cpp/src/qpid/cluster/exp/Core.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/cluster/exp/Core.h b/qpid/cpp/src/qpid/cluster/exp/Core.h index 8b83a0004d..d0dc8e57a8 100644 --- a/qpid/cpp/src/qpid/cluster/exp/Core.h +++ b/qpid/cpp/src/qpid/cluster/exp/Core.h @@ -44,7 +44,7 @@ class Broker; namespace cluster { class EventHandler; -class BrokerHandler; +class BrokerContext; /** * Cluster core state machine. @@ -77,16 +77,17 @@ class Core broker::Broker& getBroker() { return broker; } EventHandler& getEventHandler() { return *eventHandler; } - BrokerHandler& getBrokerHandler() { return *brokerHandler; } + BrokerContext& getBrokerContext() { return *brokerHandler; } + Multicaster& getMulticaster() { return multicaster; } /** Map of messages that are currently being routed. - * Used to pass messages being routed from BrokerHandler to MessageHandler + * Used to pass messages being routed from BrokerContext to MessageHandler */ RoutingMap& getRoutingMap() { return routingMap; } private: broker::Broker& broker; std::auto_ptr<EventHandler> eventHandler; // Handles CPG events. - BrokerHandler* brokerHandler; // Handles broker events. + BrokerContext* brokerHandler; // Handles broker events. RoutingMap routingMap; Multicaster multicaster; }; |