From 172d9b2a16cfb817bbe632d050acba7e31401cd2 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 18 Oct 2012 13:37:42 +0000 Subject: WIP - async store interface working for configuration (adding and removing queues, links and exchanges) and for enqueues and dequeues of messages. Transactions are not yet included, and hence some tests will fail. git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1399662 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/xml/XmlExchange.cpp | 10 +++++----- cpp/src/qpid/xml/XmlExchange.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'cpp/src/qpid/xml') diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/cpp/src/qpid/xml/XmlExchange.cpp index 22eeff41c5..55800ac464 100644 --- a/cpp/src/qpid/xml/XmlExchange.cpp +++ b/cpp/src/qpid/xml/XmlExchange.cpp @@ -116,7 +116,7 @@ XmlExchange::XmlExchange(const std::string& _name, bool _durable, mgmtExchange->set_type (typeName); } -bool XmlExchange::bind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args) +bool XmlExchange::bind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args, AsyncStore* const store) { // Federation uses bind for unbind and reorigin comands as well as for binds. @@ -136,7 +136,7 @@ bool XmlExchange::bind(Queue::shared_ptr queue, const std::string& bindingKey, c } if (fedOp == fedOpUnbind) { - return fedUnbind(fedOrigin, fedTags, queue, bindingKey, args); + return fedUnbind(fedOrigin, fedTags, queue, bindingKey, args, store); } else if (fedOp == fedOpReorigin) { fedReorigin(); @@ -176,7 +176,7 @@ bool XmlExchange::bind(Queue::shared_ptr queue, const std::string& bindingKey, c return true; } -bool XmlExchange::unbind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args) +bool XmlExchange::unbind(Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args, AsyncStore* const /*store*/) { /* * When called directly, no qpidFedOrigin argument will be @@ -383,11 +383,11 @@ void XmlExchange::propagateFedOp(const std::string& bindingKey, const std::strin Exchange::propagateFedOp(bindingKey, fedTags, fedOp, fedOrigin, propArgs); } -bool XmlExchange::fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args) +bool XmlExchange::fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const FieldTable* args, AsyncStore* const store) { RWlock::ScopedRlock l(lock); - if (unbind(queue, bindingKey, args)) { + if (unbind(queue, bindingKey, args, store)) { propagateFedOp(bindingKey, fedTags, fedOpUnbind, fedOrigin); return true; } diff --git a/cpp/src/qpid/xml/XmlExchange.h b/cpp/src/qpid/xml/XmlExchange.h index a80588c7ab..1fb9439b9b 100644 --- a/cpp/src/qpid/xml/XmlExchange.h +++ b/cpp/src/qpid/xml/XmlExchange.h @@ -76,9 +76,9 @@ class XmlExchange : public virtual Exchange { virtual std::string getType() const { return typeName; } - virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args, AsyncStore* const store); - virtual bool unbind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + virtual bool unbind(Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args, AsyncStore* const store); virtual void route(Deliverable& msg); @@ -86,7 +86,7 @@ class XmlExchange : public virtual Exchange { virtual void propagateFedOp(const std::string& bindingKey, const std::string& fedTags, const std::string& fedOp, const std::string& fedOrigin, const qpid::framing::FieldTable* args=0); - virtual bool fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const qpid::framing::FieldTable* args); + virtual bool fedUnbind(const std::string& fedOrigin, const std::string& fedTags, Queue::shared_ptr queue, const std::string& bindingKey, const qpid::framing::FieldTable* args, AsyncStore* const store); virtual void fedReorigin(); -- cgit v1.2.1