summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/asyncStore
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/qpid/asyncStore')
-rw-r--r--cpp/src/qpid/asyncStore/AsyncOperation.cpp9
-rw-r--r--cpp/src/qpid/asyncStore/AsyncOperation.h10
-rw-r--r--cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp32
-rw-r--r--cpp/src/qpid/asyncStore/AsyncStoreImpl.h32
-rw-r--r--cpp/src/qpid/asyncStore/OperationQueue.cpp2
5 files changed, 42 insertions, 43 deletions
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
index 87d3713b96..19b15b12d0 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
@@ -24,7 +24,6 @@
#include "AsyncOperation.h"
#include "qpid/Exception.h"
-#include "qpid/broker/BrokerContext.h" // for delete in d'tor
#include <sstream>
@@ -43,7 +42,7 @@ AsyncOperation::AsyncOperation() :
AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(0),
@@ -56,7 +55,7 @@ AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::DataSource* dataSrc,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(dataSrc),
@@ -69,7 +68,7 @@ AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::TxnHandle* txnHandle,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(0),
@@ -83,7 +82,7 @@ AsyncOperation::AsyncOperation(const opCode op,
const qpid::broker::DataSource* dataSrc,
const qpid::broker::TxnHandle* txnHandle,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt) :
+ qpid::broker::BrokerAsyncContext* brokerCtxt) :
m_op(op),
m_targetHandle(th),
m_dataSrc(dataSrc),
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.h b/cpp/src/qpid/asyncStore/AsyncOperation.h
index 756b393b90..998d03955e 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.h
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.h
@@ -51,23 +51,23 @@ public:
AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::DataSource* dataSrc,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::TxnHandle* txnHandle,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
AsyncOperation(const opCode op,
const qpid::broker::IdHandle* th,
const qpid::broker::DataSource* dataSrc,
const qpid::broker::TxnHandle* txnHandle,
const qpid::broker::ResultCallback resCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
virtual ~AsyncOperation();
const char* getOpStr() const;
static const char* getOpStr(const opCode op);
@@ -77,7 +77,7 @@ public:
const qpid::broker::DataSource* m_dataSrc;
const qpid::broker::TxnHandle* m_txnHandle;
const qpid::broker::ResultCallback m_resCb;
- qpid::broker::BrokerContext* m_brokerCtxt;
+ qpid::broker::BrokerAsyncContext* m_brokerCtxt;
};
}} // namespace qpid::asyncStore
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
index 3bdb2c3b98..5a4905fef6 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
@@ -105,7 +105,7 @@ AsyncStoreImpl::createEnqueueHandle(qpid::broker::MessageHandle& msgHandle,
void
AsyncStoreImpl::submitPrepare(qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::TXN_PREPARE,
dynamic_cast<qpid::broker::IdHandle*>(&txnHandle),
@@ -117,7 +117,7 @@ AsyncStoreImpl::submitPrepare(qpid::broker::TxnHandle& txnHandle,
void
AsyncStoreImpl::submitCommit(qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::TXN_COMMIT,
dynamic_cast<qpid::broker::IdHandle*>(&txnHandle),
@@ -129,7 +129,7 @@ AsyncStoreImpl::submitCommit(qpid::broker::TxnHandle& txnHandle,
void
AsyncStoreImpl::submitAbort(qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::TXN_ABORT,
dynamic_cast<qpid::broker::IdHandle*>(&txnHandle),
@@ -142,7 +142,7 @@ void
AsyncStoreImpl::submitCreate(qpid::broker::ConfigHandle& cfgHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::CONFIG_CREATE,
dynamic_cast<qpid::broker::IdHandle*>(&cfgHandle),
@@ -155,7 +155,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::ConfigHandle& cfgHandle,
void
AsyncStoreImpl::submitDestroy(qpid::broker::ConfigHandle& cfgHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::CONFIG_DESTROY,
dynamic_cast<qpid::broker::IdHandle*>(&cfgHandle),
@@ -168,7 +168,7 @@ void
AsyncStoreImpl::submitCreate(qpid::broker::QueueHandle& queueHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::QUEUE_CREATE,
dynamic_cast<qpid::broker::IdHandle*>(&queueHandle),
@@ -181,7 +181,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::QueueHandle& queueHandle,
void
AsyncStoreImpl::submitDestroy(qpid::broker::QueueHandle& queueHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::QUEUE_DESTROY,
dynamic_cast<qpid::broker::IdHandle*>(&queueHandle),
@@ -193,7 +193,7 @@ AsyncStoreImpl::submitDestroy(qpid::broker::QueueHandle& queueHandle,
void
AsyncStoreImpl::submitFlush(qpid::broker::QueueHandle& queueHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::QUEUE_FLUSH,
dynamic_cast<qpid::broker::IdHandle*>(&queueHandle),
@@ -206,7 +206,7 @@ void
AsyncStoreImpl::submitCreate(qpid::broker::EventHandle& eventHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::EVENT_CREATE,
dynamic_cast<qpid::broker::IdHandle*>(&eventHandle),
@@ -221,7 +221,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::EventHandle& eventHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::EVENT_CREATE,
dynamic_cast<qpid::broker::IdHandle*>(&eventHandle),
@@ -235,7 +235,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::EventHandle& eventHandle,
void
AsyncStoreImpl::submitDestroy(qpid::broker::EventHandle& eventHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::EVENT_DESTROY,
dynamic_cast<qpid::broker::IdHandle*>(&eventHandle),
@@ -248,7 +248,7 @@ void
AsyncStoreImpl::submitDestroy(qpid::broker::EventHandle& eventHandle,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::EVENT_DESTROY,
dynamic_cast<qpid::broker::IdHandle*>(&eventHandle),
@@ -261,7 +261,7 @@ AsyncStoreImpl::submitDestroy(qpid::broker::EventHandle& eventHandle,
void
AsyncStoreImpl::submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::MSG_ENQUEUE,
dynamic_cast<qpid::broker::IdHandle*>(&enqHandle),
@@ -274,7 +274,7 @@ void
AsyncStoreImpl::submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::MSG_ENQUEUE,
dynamic_cast<qpid::broker::IdHandle*>(&enqHandle),
@@ -287,7 +287,7 @@ AsyncStoreImpl::submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
void
AsyncStoreImpl::submitDequeue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::MSG_DEQUEUE,
dynamic_cast<qpid::broker::IdHandle*>(&enqHandle),
@@ -300,7 +300,7 @@ void
AsyncStoreImpl::submitDequeue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt)
+ qpid::broker::BrokerAsyncContext* brokerCtxt)
{
AsyncOperation* op = new AsyncOperation(AsyncOperation::MSG_DEQUEUE,
dynamic_cast<qpid::broker::IdHandle*>(&enqHandle),
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
index c33e9030fe..7e3b3e94da 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
@@ -66,64 +66,64 @@ public:
void submitPrepare(qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitCommit(qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitAbort(qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitCreate(qpid::broker::ConfigHandle& cfgHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitDestroy(qpid::broker::ConfigHandle& cfgHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitCreate(qpid::broker::QueueHandle& queueHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitDestroy(qpid::broker::QueueHandle& queueHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitFlush(qpid::broker::QueueHandle& queueHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitCreate(qpid::broker::EventHandle& eventHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitCreate(qpid::broker::EventHandle& eventHandle,
const qpid::broker::DataSource* dataSrc,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitDestroy(qpid::broker::EventHandle& eventHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitDestroy(qpid::broker::EventHandle& eventHandle,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitDequeue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
void submitDequeue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::TxnHandle& txnHandle,
qpid::broker::ResultCallback resultCb,
- qpid::broker::BrokerContext* brokerCtxt);
+ qpid::broker::BrokerAsyncContext* brokerCtxt);
// Legacy - Restore FTD message, is NOT async!
virtual int loadContent(qpid::broker::MessageHandle& msgHandle,
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.cpp b/cpp/src/qpid/asyncStore/OperationQueue.cpp
index 298d6d3061..1e52eb3612 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.cpp
+++ b/cpp/src/qpid/asyncStore/OperationQueue.cpp
@@ -23,7 +23,7 @@
#include "OperationQueue.h"
-#include "qpid/broker/BrokerContext.h"
+#include "qpid/broker/BrokerAsyncContext.h"
namespace qpid {
namespace asyncStore {
View Lorry Controller Status