summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorKim van der Riet <kpvdr@apache.org>2012-08-02 15:31:51 +0000
committerKim van der Riet <kpvdr@apache.org>2012-08-02 15:31:51 +0000
commit04877fec0c6346edec67072d7f2d247740cf2af5 (patch)
treee14572fc8cfc2862d32d422c7360754db8967c06 /cpp/src
parent80bfab9ed823cebd9f8f58b559fd32df108bcf7d (diff)
downloadqpid-python-04877fec0c6346edec67072d7f2d247740cf2af5.tar.gz
QPID-3858: WIP: Added smoke test to cmake, code format tidy-up
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1368541 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/qpid/asyncStore/AsyncOperation.cpp12
-rw-r--r--cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp79
-rw-r--r--cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp12
-rw-r--r--cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp6
-rw-r--r--cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp3
-rw-r--r--cpp/src/qpid/asyncStore/EventHandleImpl.cpp6
-rw-r--r--cpp/src/qpid/asyncStore/MessageHandleImpl.cpp3
-rw-r--r--cpp/src/qpid/asyncStore/OperationQueue.cpp9
-rw-r--r--cpp/src/qpid/asyncStore/Plugin.cpp12
-rw-r--r--cpp/src/qpid/asyncStore/QueueHandleImpl.cpp6
-rw-r--r--cpp/src/qpid/asyncStore/RunState.cpp27
-rw-r--r--cpp/src/qpid/asyncStore/TxnHandleImpl.cpp9
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.cpp51
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp18
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp39
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp18
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp24
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp18
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp18
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp24
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp30
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp33
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp30
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp21
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp9
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp18
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp12
-rw-r--r--cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp18
-rw-r--r--cpp/src/qpid/broker/AsyncResultHandle.cpp22
-rw-r--r--cpp/src/qpid/broker/AsyncResultHandleImpl.cpp12
-rw-r--r--cpp/src/qpid/broker/AsyncResultQueueImpl.cpp9
-rw-r--r--cpp/src/qpid/broker/ConfigHandle.cpp6
-rw-r--r--cpp/src/qpid/broker/EnqueueHandle.cpp6
-rw-r--r--cpp/src/qpid/broker/EventHandle.cpp9
-rw-r--r--cpp/src/qpid/broker/SimpleTxnBuffer.cpp3
-rw-r--r--cpp/src/qpid/broker/TxnAsyncContext.cpp12
-rw-r--r--cpp/src/qpid/broker/TxnHandle.cpp6
-rw-r--r--cpp/src/tests/asyncstore.cmake48
-rw-r--r--cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp14
-rw-r--r--cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h2
-rw-r--r--cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp15
-rw-r--r--cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h3
-rw-r--r--cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp45
-rw-r--r--cpp/src/tests/storePerftools/common/Parameters.cpp33
-rw-r--r--cpp/src/tests/storePerftools/common/Parameters.h3
-rw-r--r--cpp/src/tests/storePerftools/common/PerftoolError.cpp33
-rw-r--r--cpp/src/tests/storePerftools/common/PerftoolError.h3
-rw-r--r--cpp/src/tests/storePerftools/common/ScopedTimable.cpp6
-rw-r--r--cpp/src/tests/storePerftools/common/ScopedTimer.cpp6
-rw-r--r--cpp/src/tests/storePerftools/common/Streamable.cpp9
-rw-r--r--cpp/src/tests/storePerftools/common/TestOptions.cpp12
-rw-r--r--cpp/src/tests/storePerftools/common/TestParameters.cpp15
-rw-r--r--cpp/src/tests/storePerftools/common/TestResult.cpp38
-rw-r--r--cpp/src/tests/storePerftools/common/TestResult.h3
-rw-r--r--cpp/src/tests/storePerftools/common/Thread.cpp10
-rw-r--r--cpp/src/tests/storePerftools/common/Thread.h3
-rw-r--r--cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp21
-rw-r--r--cpp/src/tests/storePerftools/jrnlPerf/Journal.h1
-rw-r--r--cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp15
-rw-r--r--cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp24
-rw-r--r--cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp6
-rwxr-xr-xcpp/src/tests/storePerftools/storePerftoolsSmokeTest.sh51
-rw-r--r--cpp/src/tests/storePerftools/version.h4
63 files changed, 395 insertions, 678 deletions
diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
index 0e3586854c..3a53b4df1b 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
@@ -35,24 +35,20 @@ AsyncOperation::AsyncOperation(boost::shared_ptr<qpid::broker::BrokerAsyncContex
m_brokerCtxt(brokerCtxt)
{}
-AsyncOperation::~AsyncOperation()
-{}
+AsyncOperation::~AsyncOperation() {}
-boost::shared_ptr<qpid::broker::BrokerAsyncContext> AsyncOperation::getBrokerContext() const
-{
+boost::shared_ptr<qpid::broker::BrokerAsyncContext> AsyncOperation::getBrokerContext() const {
return m_brokerCtxt;
}
void
-AsyncOperation::submitResult()
-{
+AsyncOperation::submitResult() {
return submitResult(0, "");
}
void
AsyncOperation::submitResult(const int errNo,
- const std::string& errMsg)
-{
+ const std::string& errMsg) {
if (m_brokerCtxt.get()) {
qpid::broker::AsyncResultQueue* const arq = m_brokerCtxt->getAsyncResultQueue();
if (arq) {
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
index 2ee1d23025..5c62782278 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
@@ -51,54 +51,45 @@ AsyncStoreImpl::AsyncStoreImpl(boost::shared_ptr<qpid::sys::Poller> poller,
m_operations(m_poller)
{}
-AsyncStoreImpl::~AsyncStoreImpl()
-{}
+AsyncStoreImpl::~AsyncStoreImpl() {}
void
-AsyncStoreImpl::initialize()
-{}
+AsyncStoreImpl::initialize() {}
uint64_t
-AsyncStoreImpl::getNextRid()
-{
+AsyncStoreImpl::getNextRid() {
return m_ridCntr.next();
}
void
-AsyncStoreImpl::initManagement(qpid::broker::Broker* /*broker*/)
-{}
+AsyncStoreImpl::initManagement(qpid::broker::Broker* /*broker*/) {}
qpid::broker::TxnHandle
-AsyncStoreImpl::createTxnHandle()
-{
+AsyncStoreImpl::createTxnHandle() {
return qpid::broker::TxnHandle(new TxnHandleImpl);
}
qpid::broker::TxnHandle
-AsyncStoreImpl::createTxnHandle(qpid::broker::SimpleTxnBuffer* tb)
-{
+AsyncStoreImpl::createTxnHandle(qpid::broker::SimpleTxnBuffer* tb) {
return qpid::broker::TxnHandle(new TxnHandleImpl(tb));
}
qpid::broker::TxnHandle
AsyncStoreImpl::createTxnHandle(const std::string& xid,
- const bool tpcFlag)
-{
+ const bool tpcFlag) {
return qpid::broker::TxnHandle(new TxnHandleImpl(xid, tpcFlag));
}
qpid::broker::TxnHandle
AsyncStoreImpl::createTxnHandle(const std::string& xid,
const bool tpcFlag,
- qpid::broker::SimpleTxnBuffer* tb)
-{
+ qpid::broker::SimpleTxnBuffer* tb) {
return qpid::broker::TxnHandle(new TxnHandleImpl(xid, tpcFlag, tb));
}
void
AsyncStoreImpl::submitPrepare(qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::TpcTxnAsyncContext> TxnCtxt)
-{
+ boost::shared_ptr<qpid::broker::TpcTxnAsyncContext> TxnCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpTxnPrepare(txnHandle, TxnCtxt));
TxnCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -106,8 +97,7 @@ AsyncStoreImpl::submitPrepare(qpid::broker::TxnHandle& txnHandle,
void
AsyncStoreImpl::submitCommit(qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::TxnAsyncContext> TxnCtxt)
-{
+ boost::shared_ptr<qpid::broker::TxnAsyncContext> TxnCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpTxnCommit(txnHandle, TxnCtxt));
TxnCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -115,54 +105,46 @@ AsyncStoreImpl::submitCommit(qpid::broker::TxnHandle& txnHandle,
void
AsyncStoreImpl::submitAbort(qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::TxnAsyncContext> TxnCtxt)
-{
+ boost::shared_ptr<qpid::broker::TxnAsyncContext> TxnCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpTxnAbort(txnHandle, TxnCtxt));
TxnCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
}
qpid::broker::ConfigHandle
-AsyncStoreImpl::createConfigHandle()
-{
+AsyncStoreImpl::createConfigHandle() {
return qpid::broker::ConfigHandle(new ConfigHandleImpl());
}
qpid::broker::EnqueueHandle
AsyncStoreImpl::createEnqueueHandle(qpid::broker::MessageHandle& msgHandle,
- qpid::broker::QueueHandle& queueHandle)
-{
+ qpid::broker::QueueHandle& queueHandle) {
return qpid::broker::EnqueueHandle(new EnqueueHandleImpl(msgHandle,
queueHandle));
}
qpid::broker::EventHandle
AsyncStoreImpl::createEventHandle(qpid::broker::QueueHandle& queueHandle,
- const std::string& key)
-{
+ const std::string& key) {
return qpid::broker::EventHandle(new EventHandleImpl(queueHandle,
key));
}
qpid::broker::MessageHandle
-AsyncStoreImpl::createMessageHandle(const qpid::broker::DataSource* const dataSrc)
-
-{
+AsyncStoreImpl::createMessageHandle(const qpid::broker::DataSource* const dataSrc) {
return qpid::broker::MessageHandle(new MessageHandleImpl(dataSrc));
}
qpid::broker::QueueHandle
AsyncStoreImpl::createQueueHandle(const std::string& name,
- const qpid::types::Variant::Map& opts)
-{
+ const qpid::types::Variant::Map& opts) {
return qpid::broker::QueueHandle(new QueueHandleImpl(name, opts));
}
void
AsyncStoreImpl::submitCreate(qpid::broker::ConfigHandle& cfgHandle,
const qpid::broker::DataSource* const dataSrc,
- boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt)
-{
+ boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpConfigCreate(cfgHandle, dataSrc, brokerCtxt));
brokerCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -170,8 +152,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::ConfigHandle& cfgHandle,
void
AsyncStoreImpl::submitDestroy(qpid::broker::ConfigHandle& cfgHandle,
- boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt)
-{
+ boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpConfigDestroy(cfgHandle, brokerCtxt));
brokerCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -180,8 +161,7 @@ AsyncStoreImpl::submitDestroy(qpid::broker::ConfigHandle& cfgHandle,
void
AsyncStoreImpl::submitCreate(qpid::broker::QueueHandle& queueHandle,
const qpid::broker::DataSource* const dataSrc,
- boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt)
-{
+ boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpQueueCreate(queueHandle, dataSrc, QueueCtxt));
QueueCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -189,8 +169,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::QueueHandle& queueHandle,
void
AsyncStoreImpl::submitDestroy(qpid::broker::QueueHandle& queueHandle,
- boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt)
-{
+ boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpQueueDestroy(queueHandle, QueueCtxt));
QueueCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -198,8 +177,7 @@ AsyncStoreImpl::submitDestroy(qpid::broker::QueueHandle& queueHandle,
void
AsyncStoreImpl::submitFlush(qpid::broker::QueueHandle& queueHandle,
- boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt)
-{
+ boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpQueueFlush(queueHandle, QueueCtxt));
QueueCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -209,8 +187,7 @@ void
AsyncStoreImpl::submitCreate(qpid::broker::EventHandle& eventHandle,
const qpid::broker::DataSource* const dataSrc,
qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt)
-{
+ boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpEventCreate(eventHandle, dataSrc, txnHandle, brokerCtxt));
brokerCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -219,8 +196,7 @@ AsyncStoreImpl::submitCreate(qpid::broker::EventHandle& eventHandle,
void
AsyncStoreImpl::submitDestroy(qpid::broker::EventHandle& eventHandle,
qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt)
-{
+ boost::shared_ptr<qpid::broker::BrokerAsyncContext> brokerCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpEventDestroy(eventHandle, txnHandle, brokerCtxt));
brokerCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -229,8 +205,7 @@ AsyncStoreImpl::submitDestroy(qpid::broker::EventHandle& eventHandle,
void
AsyncStoreImpl::submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt)
-{
+ boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpMsgEnqueue(enqHandle, txnHandle, QueueCtxt));
QueueCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -239,8 +214,7 @@ AsyncStoreImpl::submitEnqueue(qpid::broker::EnqueueHandle& enqHandle,
void
AsyncStoreImpl::submitDequeue(qpid::broker::EnqueueHandle& enqHandle,
qpid::broker::TxnHandle& txnHandle,
- boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt)
-{
+ boost::shared_ptr<qpid::broker::QueueAsyncContext> QueueCtxt) {
boost::shared_ptr<const AsyncOperation> op(new AsyncOpMsgDequeue(enqHandle, txnHandle, QueueCtxt));
QueueCtxt->setOpStr(op->getOpStr());
m_operations.submit(op);
@@ -251,8 +225,7 @@ AsyncStoreImpl::loadContent(qpid::broker::MessageHandle& /*msgHandle*/,
qpid::broker::QueueHandle& /*queueHandle*/,
char* /*data*/,
uint64_t /*offset*/,
- const uint64_t /*length*/)
-{
+ const uint64_t /*length*/) {
return 0;
}
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
index 7037ca226f..ea953da0dc 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
@@ -43,24 +43,20 @@ AsyncStoreOptions::AsyncStoreOptions(const std::string& storeDir,
m_storeDir(storeDir)
{}
-AsyncStoreOptions::~AsyncStoreOptions()
-{}
+AsyncStoreOptions::~AsyncStoreOptions() {}
void
-AsyncStoreOptions::printVals(std::ostream& os) const
-{
+AsyncStoreOptions::printVals(std::ostream& os) const {
os << "ASYNC STORE OPTIONS:" << std::endl;
os << " Store directory location for persistence [store-dir]: \"" << m_storeDir << "\"" << std::endl;
}
void
-AsyncStoreOptions::validate()
-{}
+AsyncStoreOptions::validate() {}
// private static
std::string&
-AsyncStoreOptions::getDefaultStoreDir()
-{
+AsyncStoreOptions::getDefaultStoreDir() {
static std::string s_defaultStoreDir = "/tmp";
return s_defaultStoreDir;
}
diff --git a/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp b/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
index fc47f330a4..94984965e0 100644
--- a/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
@@ -26,10 +26,8 @@
namespace qpid {
namespace asyncStore {
-ConfigHandleImpl::ConfigHandleImpl()
-{}
+ConfigHandleImpl::ConfigHandleImpl() {}
-ConfigHandleImpl::~ConfigHandleImpl()
-{}
+ConfigHandleImpl::~ConfigHandleImpl() {}
}} // namespace qpid::asyncStore
diff --git a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
index be87831520..44ab5da26a 100644
--- a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
@@ -32,7 +32,6 @@ EnqueueHandleImpl::EnqueueHandleImpl(qpid::broker::MessageHandle& msgHandle,
m_queueHandle(queueHandle)
{}
-EnqueueHandleImpl::~EnqueueHandleImpl()
-{}
+EnqueueHandleImpl::~EnqueueHandleImpl() {}
}} // namespace qpid::asyncStore
diff --git a/cpp/src/qpid/asyncStore/EventHandleImpl.cpp b/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
index 4fd8805912..fec98dcfdf 100644
--- a/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
@@ -32,12 +32,10 @@ EventHandleImpl::EventHandleImpl(qpid::broker::QueueHandle& queueHandle,
m_key(key)
{}
-EventHandleImpl::~EventHandleImpl()
-{}
+EventHandleImpl::~EventHandleImpl() {}
const std::string&
-EventHandleImpl::getKey() const
-{
+EventHandleImpl::getKey() const {
return m_key;
}
diff --git a/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp b/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
index a926aa161f..3ea3333dd1 100644
--- a/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
@@ -30,7 +30,6 @@ MessageHandleImpl::MessageHandleImpl(const qpid::broker::DataSource* dataSrc) :
m_dataSrc(dataSrc)
{}
-MessageHandleImpl::~MessageHandleImpl()
-{}
+MessageHandleImpl::~MessageHandleImpl() {}
}} // namespace qpid::asyncStore
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.cpp b/cpp/src/qpid/asyncStore/OperationQueue.cpp
index b7b8970c39..09fa8c7048 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.cpp
+++ b/cpp/src/qpid/asyncStore/OperationQueue.cpp
@@ -36,21 +36,18 @@ OperationQueue::OperationQueue(const boost::shared_ptr<qpid::sys::Poller>& polle
m_opQueue.start();
}
-OperationQueue::~OperationQueue()
-{
+OperationQueue::~OperationQueue() {
m_opQueue.stop();
}
void
-OperationQueue::submit(boost::shared_ptr<const AsyncOperation> op)
-{
+OperationQueue::submit(boost::shared_ptr<const AsyncOperation> op) {
m_opQueue.push(op);
}
// private
OperationQueue::OpQueue::Batch::const_iterator
-OperationQueue::handle(const OperationQueue::OpQueue::Batch& e)
-{
+OperationQueue::handle(const OperationQueue::OpQueue::Batch& e) {
try {
for (OpQueue::Batch::const_iterator i = e.begin(); i != e.end(); ++i) {
boost::shared_ptr<qpid::broker::BrokerAsyncContext> bc = (*i)->getBrokerContext();
diff --git a/cpp/src/qpid/asyncStore/Plugin.cpp b/cpp/src/qpid/asyncStore/Plugin.cpp
index 400237df75..a577e6c040 100644
--- a/cpp/src/qpid/asyncStore/Plugin.cpp
+++ b/cpp/src/qpid/asyncStore/Plugin.cpp
@@ -31,8 +31,7 @@ namespace qpid {
namespace broker {
void
-Plugin::earlyInitialize(Target& target)
-{
+Plugin::earlyInitialize(Target& target) {
Broker* broker = dynamic_cast<Broker*>(&target);
if (!broker) return;
DataDir& dataDir = broker->getDataDir ();
@@ -52,8 +51,7 @@ Plugin::earlyInitialize(Target& target)
}
void
-Plugin::initialize(Target& target)
-{
+Plugin::initialize(Target& target) {
Broker* broker = dynamic_cast<Broker*>(&target);
if (!broker || !m_store) return;
@@ -67,14 +65,12 @@ Plugin::initialize(Target& target)
}
void
-Plugin::finalize()
-{
+Plugin::finalize() {
m_store.reset();
}
qpid::Options*
-Plugin::getOptions()
-{
+Plugin::getOptions() {
return &m_options;
}
diff --git a/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp b/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
index 3781329b92..ddb10be7b3 100644
--- a/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
@@ -32,12 +32,10 @@ QueueHandleImpl::QueueHandleImpl(const std::string& name,
m_opts(opts)
{}
-QueueHandleImpl::~QueueHandleImpl()
-{}
+QueueHandleImpl::~QueueHandleImpl() {}
const std::string&
-QueueHandleImpl::getName() const
-{
+QueueHandleImpl::getName() const {
return m_name;
}
diff --git a/cpp/src/qpid/asyncStore/RunState.cpp b/cpp/src/qpid/asyncStore/RunState.cpp
index 737d8eb367..9ad05655ed 100644
--- a/cpp/src/qpid/asyncStore/RunState.cpp
+++ b/cpp/src/qpid/asyncStore/RunState.cpp
@@ -42,49 +42,41 @@ RunState::RunState(const RunState& s) :
qpid::asyncStore::jrnl2::State<RunState_t>(s)
{}
-RunState::~RunState()
-{}
+RunState::~RunState() {}
void
-RunState::setInitializing()
-{
+RunState::setInitializing() {
set(RS_INITIALIZING);
}
void
-RunState::setRestoring()
-{
+RunState::setRestoring() {
set(RS_RESTORING);
}
void
-RunState::setRunning()
-{
+RunState::setRunning() {
set(RS_RUNNING);
}
void
-RunState::setStopping()
-{
+RunState::setStopping() {
set(RS_STOPPING);
}
void
-RunState::setStopped()
-{
+RunState::setStopped() {
set(RS_STOPPED);
}
const char*
-RunState::getAsStr() const
-{
+RunState::getAsStr() const {
return s_toStr(m_state);
}
//static
const char*
-RunState::s_toStr(const RunState_t s)
-{
+RunState::s_toStr(const RunState_t s) {
switch (s) {
case RS_NONE:
return "WR_NONE";
@@ -107,8 +99,7 @@ RunState::s_toStr(const RunState_t s)
// private
void
-RunState::set(const RunState_t s)
-{
+RunState::set(const RunState_t s) {
// State transition logic: set stateError to true if an invalid transition is attempted
bool stateTransitionError = false;
switch (m_state) {
diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
index 50dce1b2af..8f41d4ce81 100644
--- a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
@@ -50,18 +50,15 @@ TxnHandleImpl::TxnHandleImpl(const std::string& xid,
m_txnBuffer(tb)
{}
-TxnHandleImpl::~TxnHandleImpl()
-{}
+TxnHandleImpl::~TxnHandleImpl() {}
const std::string&
-TxnHandleImpl::getXid() const
-{
+TxnHandleImpl::getXid() const {
return m_xid;
}
bool
-TxnHandleImpl::is2pc() const
-{
+TxnHandleImpl::is2pc() const {
return m_tpcFlag;
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.cpp b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.cpp
index 979b91579f..2f879bb333 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.cpp
@@ -36,8 +36,7 @@ namespace asyncStore {
namespace jrnl2 {
std::string
-g_ioResAsString(const jrnlOpRes /*res*/)
-{
+g_ioResAsString(const jrnlOpRes /*res*/) {
/// \todo TODO - provide implementation
return ".[g_ioResAsString].";
}
@@ -56,45 +55,38 @@ AsyncJournal::AsyncJournal(const std::string& jrnlId,
}
std::string
-AsyncJournal::getId() const
-{
+AsyncJournal::getId() const {
return m_jrnlId;
}
JournalDirectory
-AsyncJournal::getJournalDir() const
-{
+AsyncJournal::getJournalDir() const {
return m_jrnlDir;
}
std::string
-AsyncJournal::getJournalDirName() const
-{
+AsyncJournal::getJournalDirName() const {
return m_jrnlDir.getFqName();
}
std::string
-AsyncJournal::getBaseFileName() const
-{
+AsyncJournal::getBaseFileName() const {
return m_baseFileName;
}
const JournalRunState&
-AsyncJournal::getState() const
-{
+AsyncJournal::getState() const {
return m_jrnlState;
}
const JournalParameters*
-AsyncJournal::getParameters() const
-{
+AsyncJournal::getParameters() const {
return m_jrnlParamsPtr;
}
void
AsyncJournal::initialize(const JournalParameters* jpPtr,
- AioCallback* const aiocbPtr)
-{
+ AioCallback* const aiocbPtr) {
m_jrnlParamsPtr = jpPtr;
m_aioCallbackPtr = aiocbPtr;
// --- temp code ---
@@ -108,8 +100,7 @@ AsyncJournal::enqueue(DataToken* dtokPtr,
const std::size_t /*dataLen*/,
const void* /*tidPtr*/,
const std::size_t /*tidLen*/,
- const bool /*transientFlag*/)
-{
+ const bool /*transientFlag*/) {
dtokPtr->getDataOpState().enqueue();
// --- temp code ---
{ // --- START OF CRITICAL SECTION ---
@@ -127,8 +118,7 @@ AsyncJournal::enqueue(DataToken* dtokPtr,
jrnlOpRes
AsyncJournal::dequeue(DataToken* const dtokPtr,
const void* /*tidPtr*/,
- const std::size_t /*tidLen*/)
-{
+ const std::size_t /*tidLen*/) {
dtokPtr->getDataOpState().dequeue();
dtokPtr->setDequeueRecordId(dtokPtr->getRecordId());
// --- temp code ---
@@ -145,22 +135,19 @@ AsyncJournal::dequeue(DataToken* const dtokPtr,
}
jrnlOpRes
-AsyncJournal::commit()
-{
+AsyncJournal::commit() {
/// \todo TODO - provide implementation
return 0;
}
jrnlOpRes
-AsyncJournal::abort()
-{
+AsyncJournal::abort() {
/// \todo TODO - provide implementation
return 0;
}
jrnlOpRes
-AsyncJournal::flush()
-{
+AsyncJournal::flush() {
// --- temp code ---
// --- START OF CRITICAL SECTION ---
ScopedTryLock l(m_writeDataTokensLock);
@@ -174,8 +161,7 @@ AsyncJournal::flush()
// protected
jrnlOpRes
-AsyncJournal::flushNoLock()
-{
+AsyncJournal::flushNoLock() {
// --- temp code ---
// Normally the page would be written to disk using libaio here (still to do).
uint32_t cnt = 0UL;
@@ -190,8 +176,7 @@ AsyncJournal::flushNoLock()
}
jrnlOpRes
-AsyncJournal::sync(const double timeout)
-{
+AsyncJournal::sync(const double timeout) {
// --- temp code ---
// --- START OF CRITICAL SECTION ---
ScopedTryLock l(m_writeDataTokensLock);
@@ -205,8 +190,7 @@ AsyncJournal::sync(const double timeout)
// protected
jrnlOpRes
-AsyncJournal::syncNoLock(const double /*timeout*/)
-{
+AsyncJournal::syncNoLock(const double /*timeout*/) {
// --- temp code ---
if (m_callbackDataTokens.size()) {
processCompletedAioWriteEvents();
@@ -216,8 +200,7 @@ AsyncJournal::syncNoLock(const double /*timeout*/)
}
void
-AsyncJournal::processCompletedAioWriteEvents(const double /*timeout*/)
-{
+AsyncJournal::processCompletedAioWriteEvents(const double /*timeout*/) {
// --- temp code ---
// --- START OF CRITICAL SECTION 1 ---
ScopedLock l1(m_callbackDataTokensLock);
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
index fc7946de5a..5123077d67 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
@@ -43,31 +43,26 @@ DataOpState::DataOpState(const DataOpState& s) :
State<opState_t>(s)
{}
-DataOpState::~DataOpState()
-{}
+DataOpState::~DataOpState() {}
void
-DataOpState::enqueue()
-{
+DataOpState::enqueue() {
set(OP_ENQUEUE);
}
void
-DataOpState::dequeue()
-{
+DataOpState::dequeue() {
set(OP_DEQUEUE);
}
const char*
-DataOpState::getAsStr() const
-{
+DataOpState::getAsStr() const {
return s_toStr(m_state);
}
// static
const char*
-DataOpState::s_toStr(const opState_t s)
-{
+DataOpState::s_toStr(const opState_t s) {
switch (s) {
case OP_NONE:
return "OP_NONE";
@@ -84,8 +79,7 @@ DataOpState::s_toStr(const opState_t s)
// private
void
-DataOpState::set(const opState_t s)
-{
+DataOpState::set(const opState_t s) {
// State transition logic: set stateError to true if an invalid transition is attempted
bool stateTransitionError = false;
switch(m_state) {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
index cd4969a7fc..c129a1dd37 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
@@ -42,81 +42,68 @@ DataToken::DataToken(const recordId_t rid) :
DataToken::~DataToken() {}
const DataOpState&
-DataToken::getDataOpState() const
-{
+DataToken::getDataOpState() const {
return m_dataOpState;
}
DataOpState&
-DataToken::getDataOpState()
-{
+DataToken::getDataOpState() {
return m_dataOpState;
}
const DataWrComplState&
-DataToken::getDataWrComplState() const
-{
+DataToken::getDataWrComplState() const {
return m_dataWrComplState;
}
DataWrComplState&
-DataToken::getDataWrComplState()
-{
+DataToken::getDataWrComplState() {
return m_dataWrComplState;
}
bool
-DataToken::isTransient() const
-{
+DataToken::isTransient() const {
return m_transientFlag;
}
bool
-DataToken::isExternal() const
-{
+DataToken::isExternal() const {
return m_externalFlag;
}
const std::string&
-DataToken::getExternalLocation() const
-{
+DataToken::getExternalLocation() const {
return m_externalLocation;
}
recordId_t
-DataToken::getRecordId() const
-{
+DataToken::getRecordId() const {
return m_recordId;
}
bool
-DataToken::isRecordIdExternal() const
-{
+DataToken::isRecordIdExternal() const {
return m_externalRecordIdFlag;
}
recordId_t
-DataToken::getDequeueRecordId() const
-{
+DataToken::getDequeueRecordId() const {
return m_dequeueRecordId;
}
void
-DataToken::setRecordId(const recordId_t rid)
-{
+DataToken::setRecordId(const recordId_t rid) {
m_recordId = rid;
m_externalRecordIdFlag = true;
}
void
-DataToken::setDequeueRecordId(const recordId_t drid)
-{
+DataToken::setDequeueRecordId(const recordId_t drid) {
m_dequeueRecordId = drid;
}
void
-DataToken::toStream(std::ostream& os) const
-{
+DataToken::toStream(std::ostream& os) const {
/// \todo TODO: Implementation required
os << "status string";
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
index c6cedc4782..f4d06360bd 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
@@ -43,31 +43,26 @@ DataWrComplState::DataWrComplState(const DataWrComplState& s) :
State<wrComplState_t>(s)
{}
-DataWrComplState::~DataWrComplState()
-{}
+DataWrComplState::~DataWrComplState() {}
void
-DataWrComplState::complete()
-{
+DataWrComplState::complete() {
set(WR_COMPLETE);
}
void
-DataWrComplState::partComplete()
-{
+DataWrComplState::partComplete() {
set(WR_PART);
}
const char*
-DataWrComplState::getAsStr() const
-{
+DataWrComplState::getAsStr() const {
return s_toStr(m_state);
}
// static
const char*
-DataWrComplState::s_toStr(const wrComplState_t s)
-{
+DataWrComplState::s_toStr(const wrComplState_t s) {
switch (s) {
case WR_NONE:
return "WR_NONE";
@@ -84,8 +79,7 @@ DataWrComplState::s_toStr(const wrComplState_t s)
// protected
void
-DataWrComplState::set(const wrComplState_t s)
-{
+DataWrComplState::set(const wrComplState_t s) {
// State transition logic: set stateError to true if an invalid transition is attempted
bool stateTransitionError = false;
switch(m_state) {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
index bf8ef5fc7f..402f48c24e 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
@@ -55,34 +55,29 @@ DequeueHeader::DequeueHeader(const DequeueHeader& dh) :
m_xidSize(dh.m_xidSize)
{}
-DequeueHeader::~DequeueHeader()
-{}
+DequeueHeader::~DequeueHeader() {}
void
-DequeueHeader::copy(const DequeueHeader& dh)
-{
+DequeueHeader::copy(const DequeueHeader& dh) {
RecordHeader::copy(dh);
m_dequeuedRecordId = dh.m_dequeuedRecordId;
m_xidSize = dh.m_xidSize;
}
void
-DequeueHeader::reset()
-{
+DequeueHeader::reset() {
RecordHeader::reset();
m_dequeuedRecordId = 0;
m_xidSize = 0;
}
bool
-DequeueHeader::getTplCommitOnTxnComplFlag() const
-{
+DequeueHeader::getTplCommitOnTxnComplFlag() const {
return m_flags & DEQ_HDR_TPL_COMMIT_ON_TXN_COMPL_MASK;
}
void
-DequeueHeader::setTplCommitOnTxnComplFlag(const bool commitOnTxnCompl)
-{
+DequeueHeader::setTplCommitOnTxnComplFlag(const bool commitOnTxnCompl) {
m_flags = commitOnTxnCompl ?
m_flags | DEQ_HDR_TPL_COMMIT_ON_TXN_COMPL_MASK :
m_flags & (~DEQ_HDR_TPL_COMMIT_ON_TXN_COMPL_MASK);
@@ -90,20 +85,17 @@ DequeueHeader::setTplCommitOnTxnComplFlag(const bool commitOnTxnCompl)
//static
uint64_t
-DequeueHeader::getHeaderSize()
-{
+DequeueHeader::getHeaderSize() {
return static_cast<uint64_t>(sizeof(DequeueHeader));
}
uint64_t
-DequeueHeader::getBodySize() const
-{
+DequeueHeader::getBodySize() const {
return m_xidSize;
}
uint64_t
-DequeueHeader::getRecordSize() const
-{
+DequeueHeader::getRecordSize() const {
return getHeaderSize() + (getBodySize() > 0LL ?
getBodySize() + RecordTail::getSize() :
0);
diff --git a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
index 213821ebe2..b2ebe95c43 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
@@ -49,32 +49,27 @@ EnqueueHeader::EnqueueHeader(const EnqueueHeader& eh) :
EventHeader(eh)
{}
-EnqueueHeader::~EnqueueHeader()
-{}
+EnqueueHeader::~EnqueueHeader() {}
bool
-EnqueueHeader::getTransientFlag() const
-{
+EnqueueHeader::getTransientFlag() const {
return m_flags & ENQ_HDR_TRANSIENT_MASK;
}
void
-EnqueueHeader::setTransientFlag(const bool transient)
-{
+EnqueueHeader::setTransientFlag(const bool transient) {
m_flags = transient ?
m_flags | ENQ_HDR_TRANSIENT_MASK :
m_flags & (~ENQ_HDR_TRANSIENT_MASK);
}
bool
-EnqueueHeader::getExternalFlag() const
-{
+EnqueueHeader::getExternalFlag() const {
return m_flags & ENQ_HDR_EXTERNAL_MASK;
}
void
-EnqueueHeader::setExternalFlag(const bool external)
-{
+EnqueueHeader::setExternalFlag(const bool external) {
m_flags = external ?
m_flags | ENQ_HDR_EXTERNAL_MASK :
m_flags & (~ENQ_HDR_EXTERNAL_MASK);
@@ -82,8 +77,7 @@ EnqueueHeader::setExternalFlag(const bool external)
//static
uint64_t
-EnqueueHeader::getHeaderSize()
-{
+EnqueueHeader::getHeaderSize() {
return sizeof(EnqueueHeader);
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
index 374d161af9..0b9c2e14d4 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
@@ -52,20 +52,17 @@ EventHeader::EventHeader(const EventHeader& eh) :
m_dataSize(eh.m_dataSize)
{}
-EventHeader::~EventHeader()
-{}
+EventHeader::~EventHeader() {}
void
-EventHeader::copy(const EventHeader& e)
-{
+EventHeader::copy(const EventHeader& e) {
RecordHeader::copy(e);
m_xidSize = e.m_xidSize;
m_dataSize = e.m_dataSize;
}
void
-EventHeader::reset()
-{
+EventHeader::reset() {
RecordHeader::reset();
m_xidSize = 0;
m_dataSize = 0;
@@ -73,20 +70,17 @@ EventHeader::reset()
//static
uint64_t
-EventHeader::getHeaderSize()
-{
+EventHeader::getHeaderSize() {
return sizeof(EventHeader);
}
uint64_t
-EventHeader::getBodySize() const
-{
+EventHeader::getBodySize() const {
return m_xidSize + m_dataSize;
}
uint64_t
-EventHeader::getRecordSize() const
-{
+EventHeader::getRecordSize() const {
return getHeaderSize() + (getBodySize() ?
getBodySize() + RecordTail::getSize() :
0);
diff --git a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
index 1b601c4cd7..169e3b4ab4 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
@@ -73,12 +73,10 @@ FileHeader::FileHeader(const FileHeader& fh) :
m_reserved(fh.m_reserved)
{}
-FileHeader::~FileHeader()
-{}
+FileHeader::~FileHeader() {}
void
-FileHeader::copy(const FileHeader& fh)
-{
+FileHeader::copy(const FileHeader& fh) {
RecordHeader::copy(fh);
m_physicalFileId = fh.m_physicalFileId;
m_logicalFileId = fh.m_logicalFileId;
@@ -89,8 +87,7 @@ FileHeader::copy(const FileHeader& fh)
}
void
-FileHeader::reset()
-{
+FileHeader::reset() {
RecordHeader::reset();
m_physicalFileId = 0;
m_logicalFileId = 0;
@@ -102,26 +99,22 @@ FileHeader::reset()
//static
uint64_t
-FileHeader::getHeaderSize()
-{
+FileHeader::getHeaderSize() {
return sizeof(FileHeader);
}
uint64_t
-FileHeader::getBodySize() const
-{
+FileHeader::getBodySize() const {
return 0;
}
uint64_t
-FileHeader::getRecordSize() const
-{
+FileHeader::getRecordSize() const {
return getHeaderSize();
}
void
-FileHeader::setTimestamp()
-{
+FileHeader::setTimestamp() {
/// \todo TODO: Standardize on method for getting time that does not require a context switch.
timespec ts;
if (::clock_gettime(CLOCK_REALTIME, &ts)) {
@@ -133,8 +126,7 @@ FileHeader::setTimestamp()
}
void
-FileHeader::setTimestamp(const timespec& ts)
-{
+FileHeader::setTimestamp(const timespec& ts) {
m_timestampSeconds = static_cast<uint64_t>(ts.tv_sec);
m_timestampNanoSeconds = static_cast<uint32_t>(ts.tv_nsec);
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
index 0ec576805d..98fe84c87d 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
@@ -42,16 +42,14 @@ JournalDirectory::JournalDirectory(const std::string& fqName) :
{}
const
-std::string JournalDirectory::getFqName() const
-{
+std::string JournalDirectory::getFqName() const {
return m_fqName;
}
void
JournalDirectory::setFqName(const std::string newFqName,
const bool createNew,
- const bool destroyExisting)
-{
+ const bool destroyExisting) {
if (m_fqName.compare(newFqName) != 0) {
if (destroyExisting) {
destroy();
@@ -66,8 +64,7 @@ JournalDirectory::setFqName(const std::string newFqName,
// static
bool
JournalDirectory::s_exists(const std::string& fqName,
- const bool checkIsWritable)
-{
+ const bool checkIsWritable) {
struct stat buff;
if (::lstat(fqName.c_str(), &buff)) {
if (errno == ENOENT) // No such dir or file
@@ -83,8 +80,7 @@ JournalDirectory::s_exists(const std::string& fqName,
// static
void
-JournalDirectory::s_create(const std::string& fqName)
-{
+JournalDirectory::s_create(const std::string& fqName) {
std::size_t fdp = fqName.find_last_of('/');
if (fdp != std::string::npos) {
std::string parent_dir = fqName.substr(0, fdp);
@@ -100,8 +96,7 @@ JournalDirectory::s_create(const std::string& fqName)
}
void
-JournalDirectory::create()
-{
+JournalDirectory::create() {
s_create(m_fqName);
m_verified = true;
}
@@ -109,14 +104,12 @@ JournalDirectory::create()
//static
void
JournalDirectory::s_clear(const std::string& fqName,
- const bool recursiveDelete)
-{
+ const bool recursiveDelete) {
s_destroy(fqName, recursiveDelete, true);
}
void
-JournalDirectory::clear(const bool recursiveDelete)
-{
+JournalDirectory::clear(const bool recursiveDelete) {
s_clear(m_fqName, recursiveDelete);
}
@@ -124,8 +117,7 @@ JournalDirectory::clear(const bool recursiveDelete)
void
JournalDirectory::s_destroy(const std::string& fqName,
const bool recursiveDelete,
- const bool childrenOnly)
-{
+ const bool childrenOnly) {
if (s_exists(fqName)) {
DIR* dir = ::opendir(fqName.c_str());
if (dir) {
@@ -161,8 +153,7 @@ JournalDirectory::s_destroy(const std::string& fqName,
void
JournalDirectory::destroy(const bool recursiveDelete,
- const bool childrenOnly)
-{
+ const bool childrenOnly) {
if (m_verified) {
s_destroy(m_fqName, recursiveDelete, childrenOnly);
m_verified = false;
@@ -170,8 +161,7 @@ JournalDirectory::destroy(const bool recursiveDelete,
}
bool
-JournalDirectory::isVerified() const
-{
+JournalDirectory::isVerified() const {
return m_verified;
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
index 3c64148b5b..24d840ea2b 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
@@ -126,49 +126,41 @@ JournalError::JournalError(const uint32_t errorCode,
formatWhatStr();
}
-JournalError::~JournalError() throw ()
-{}
+JournalError::~JournalError() throw () {}
const char*
-JournalError::what() const throw ()
-{
+JournalError::what() const throw () {
return m_what.c_str();
}
uint32_t
-JournalError::getErrorCode() const throw ()
-{
+JournalError::getErrorCode() const throw () {
return m_errorCode;
}
const std::string
-JournalError::getAdditionalInfo() const throw ()
-{
+JournalError::getAdditionalInfo() const throw () {
return m_additionalInfo;
}
const std::string
-JournalError::getThrowingClass() const throw ()
-{
+JournalError::getThrowingClass() const throw () {
return m_throwingClass;
}
const std::string
-JournalError::getThrowingFunction() const throw ()
-{
+JournalError::getThrowingFunction() const throw () {
return m_throwingFunction;
}
void
-JournalError::toStream(std::ostream& os) const
-{
+JournalError::toStream(std::ostream& os) const {
os << what();
}
// protected
void
-JournalError::formatWhatStr() throw ()
-{
+JournalError::formatWhatStr() throw () {
try {
const bool ai = !m_additionalInfo.empty();
const bool tc = !m_throwingClass.empty();
@@ -198,8 +190,7 @@ JournalError::formatWhatStr() throw ()
// protected
const char*
-JournalError::className()
-{
+JournalError::className() {
return s_className;
}
@@ -229,8 +220,7 @@ const uint32_t JournalError::JERR_DIRNOTEMPTY = 0x0208;
// static
const char*
-JournalError::s_errorMessage(const uint32_t err_no) throw ()
-{
+JournalError::s_errorMessage(const uint32_t err_no) throw () {
s_errorMapIterator = s_errorMap.find(err_no);
if (s_errorMapIterator == s_errorMap.end())
return "<Unknown error code>";
@@ -243,8 +233,7 @@ bool JournalError::s_initializedFlag = JournalError::s_initialize();
// private static
bool
-JournalError::s_initialize()
-{
+JournalError::s_initialize() {
s_errorMap[JERR_PTHREAD] = "JERR_PTHREAD: pthread operation failure";
s_errorMap[JERR_RTCLOCK] = "JERR_RTCLOCK: realtime clock operation failure";
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
index fcc6a57528..4a0d2cfd7f 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
@@ -43,55 +43,46 @@ JournalRunState::JournalRunState(const journalState_t s) :
State<journalState_t>(s)
{}
-JournalRunState::~JournalRunState()
-{}
+JournalRunState::~JournalRunState() {}
void
-JournalRunState::initialize()
-{
+JournalRunState::initialize() {
set(JS_INITIALIZING);
}
void
-JournalRunState::recoverPhase1()
-{
+JournalRunState::recoverPhase1() {
set(JS_RECOVERING_PHASE_1);
}
void
-JournalRunState::recoverPhase2()
-{
+JournalRunState::recoverPhase2() {
set(JS_RECOVERING_PHASE_2);
}
void
-JournalRunState::run()
-{
+JournalRunState::run() {
set(JS_RUNNING);
}
void
-JournalRunState::stop()
-{
+JournalRunState::stop() {
set(JS_STOPPING);
}
void
-JournalRunState::stopped()
-{
+JournalRunState::stopped() {
set(JS_STOPPED);
}
const char*
-JournalRunState::getAsStr() const
-{
+JournalRunState::getAsStr() const {
return s_toStr(m_state);
}
// static
const char*
-JournalRunState::s_toStr(const journalState_t s)
-{
+JournalRunState::s_toStr(const journalState_t s) {
switch (s) {
case JS_NONE:
return "JS_NONE";
@@ -116,8 +107,7 @@ JournalRunState::s_toStr(const journalState_t s)
// private
void
-JournalRunState::set(const journalState_t s)
-{
+JournalRunState::set(const journalState_t s) {
// State transition logic: set stateError to true if an invalid transition is attempted
bool stateTransitionError = false;
switch(m_state) {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
index 3317eb8438..e12a0c96d8 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
@@ -56,12 +56,10 @@ RecordHeader::RecordHeader(const RecordHeader& rh) :
m_recordId(rh.m_recordId)
{}
-RecordHeader::~RecordHeader()
-{}
+RecordHeader::~RecordHeader() {}
void
-RecordHeader::copy(const RecordHeader& rh)
-{
+RecordHeader::copy(const RecordHeader& rh) {
m_magic = rh.m_magic;
m_version = rh.m_version;
m_bigEndianFlag = rh.m_bigEndianFlag;
@@ -70,8 +68,7 @@ RecordHeader::copy(const RecordHeader& rh)
}
void
-RecordHeader::reset()
-{
+RecordHeader::reset() {
m_magic = 0;
m_version = 0;
m_bigEndianFlag = 0;
@@ -80,14 +77,12 @@ RecordHeader::reset()
}
bool
-RecordHeader::getOverwriteIndicator() const
-{
+RecordHeader::getOverwriteIndicator() const {
return m_flags & HDR_OVERWRITE_INDICATOR_MASK;
}
void
-RecordHeader::setOverwriteIndicator(const bool owi)
-{
+RecordHeader::setOverwriteIndicator(const bool owi) {
m_flags = owi ?
m_flags | HDR_OVERWRITE_INDICATOR_MASK :
m_flags & (~HDR_OVERWRITE_INDICATOR_MASK);
@@ -95,14 +90,12 @@ RecordHeader::setOverwriteIndicator(const bool owi)
//static
uint64_t
-RecordHeader::getHeaderSize()
-{
+RecordHeader::getHeaderSize() {
return static_cast<uint64_t>(sizeof(RecordHeader));
}
uint32_t
-RecordHeader::getCheckSum(uint32_t initialValue) const
-{
+RecordHeader::getCheckSum(uint32_t initialValue) const {
uint32_t cs = initialValue;
for (unsigned char* p = (unsigned char*)this;
p < (unsigned char*)this + getHeaderSize() + getBodySize();
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
index fe33d47b13..39e8ba5dcf 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
@@ -57,16 +57,14 @@ RecordTail::RecordTail(const RecordTail& rt) :
{}
void
-RecordTail::copy(const RecordTail& rt)
-{
+RecordTail::copy(const RecordTail& rt) {
m_xMagic = rt.m_xMagic;
m_checkSum = rt.m_checkSum;
m_recordId = rt.m_recordId;
}
void
-RecordTail::reset()
-{
+RecordTail::reset() {
m_xMagic = 0xffffffff;
m_checkSum = 0;
m_recordId = 0;
@@ -74,8 +72,7 @@ RecordTail::reset()
//static
uint64_t
-RecordTail::getSize()
-{
+RecordTail::getSize() {
return sizeof(RecordTail);
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
index 4acba534ef..90509f1754 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
@@ -40,14 +40,12 @@ ScopedMutex::ScopedMutex()
PTHREAD_CHK(::pthread_mutex_init(&m_mutex, 0), "::pthread_mutex_init", "ScopedMutex", "ScopedMutex");
}
-ScopedMutex::~ScopedMutex()
-{
+ScopedMutex::~ScopedMutex() {
PTHREAD_CHK(::pthread_mutex_destroy(&m_mutex), "::pthread_mutex_destroy", "ScopedMutex", "~ScopedMutex");
}
::pthread_mutex_t*
-ScopedMutex::get() const
-{
+ScopedMutex::get() const {
return &m_mutex;
}
@@ -58,8 +56,7 @@ ScopedMutexContainer::ScopedMutexContainer(const ScopedMutex& sm) :
m_scopedMutexRef(sm)
{}
-::pthread_mutex_t* ScopedMutexContainer::get() const
-{
+::pthread_mutex_t* ScopedMutexContainer::get() const {
return m_scopedMutexRef.get();
}
@@ -72,8 +69,7 @@ ScopedLock::ScopedLock(const ScopedMutex& sm) :
PTHREAD_CHK(::pthread_mutex_lock(m_scopedMutexRef.get()), "::pthread_mutex_lock", "ScopedLock", "ScopedLock");
}
-ScopedLock::~ScopedLock()
-{
+ScopedLock::~ScopedLock() {
PTHREAD_CHK(::pthread_mutex_unlock(m_scopedMutexRef.get()), "::pthread_mutex_unlock", "ScopedLock", "~ScopedLock");
}
@@ -91,16 +87,14 @@ ScopedTryLock::ScopedTryLock(const ScopedMutex& sm) :
}
}
-ScopedTryLock::~ScopedTryLock()
-{
+ScopedTryLock::~ScopedTryLock() {
if (m_lockedFlag)
PTHREAD_CHK(::pthread_mutex_unlock(m_scopedMutexRef.get()), "::pthread_mutex_unlock", "ScopedTryLock",
"~ScopedTryLock");
}
bool
-ScopedTryLock::isLocked() const
-{
+ScopedTryLock::isLocked() const {
return m_lockedFlag;
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp b/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
index 0ee86223b1..a153797c96 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
@@ -29,27 +29,23 @@ namespace qpid {
namespace asyncStore {
namespace jrnl2 {
-Streamable::~Streamable()
-{}
+Streamable::~Streamable() {}
std::string
-Streamable::toString() const
-{
+Streamable::toString() const {
std::ostringstream oss;
toStream(oss);
return oss.str();
}
std::ostream&
-operator<<(std::ostream& os, const Streamable& s)
-{
+operator<<(std::ostream& os, const Streamable& s) {
s.toStream(os);
return os;
}
std::ostream&
-operator<<(std::ostream& os, const Streamable* sPtr)
-{
+operator<<(std::ostream& os, const Streamable* sPtr) {
sPtr->toStream(os);
return os;
}
diff --git a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
index 9de9f2656c..6becbeea9c 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
@@ -47,39 +47,33 @@ TransactionHeader::TransactionHeader(const TransactionHeader& th) :
m_xidSize(th.m_xidSize)
{}
-TransactionHeader::~TransactionHeader()
-{}
+TransactionHeader::~TransactionHeader() {}
void
-TransactionHeader::copy(const TransactionHeader& th)
-{
+TransactionHeader::copy(const TransactionHeader& th) {
RecordHeader::copy(th);
m_xidSize = th.m_xidSize;
}
void
-TransactionHeader::reset()
-{
+TransactionHeader::reset() {
RecordHeader::reset();
m_xidSize = 0;
}
//static
uint64_t
-TransactionHeader::getHeaderSize()
-{
+TransactionHeader::getHeaderSize() {
return sizeof(TransactionHeader);
}
uint64_t
-TransactionHeader::getBodySize() const
-{
+TransactionHeader::getBodySize() const {
return m_xidSize;
}
uint64_t
-TransactionHeader::getRecordSize() const
-{
+TransactionHeader::getRecordSize() const {
// By definition, TransactionRecords must always have an xid, hence a record
// tail as well. No check on body size required in this case.
return getHeaderSize() + getBodySize() + RecordTail::getSize();
diff --git a/cpp/src/qpid/broker/AsyncResultHandle.cpp b/cpp/src/qpid/broker/AsyncResultHandle.cpp
index d2fa9ae3e0..1d42b6096f 100644
--- a/cpp/src/qpid/broker/AsyncResultHandle.cpp
+++ b/cpp/src/qpid/broker/AsyncResultHandle.cpp
@@ -32,49 +32,43 @@ namespace broker {
typedef PrivateImplRef<AsyncResultHandle> PrivateImpl;
AsyncResultHandle::AsyncResultHandle(AsyncResultHandleImpl* p) :
- Handle<AsyncResultHandleImpl>()
+ Handle<AsyncResultHandleImpl>()
{
PrivateImpl::ctor(*this, p);
}
AsyncResultHandle::AsyncResultHandle(const AsyncResultHandle& r) :
- Handle<AsyncResultHandleImpl>()
+ Handle<AsyncResultHandleImpl>()
{
PrivateImpl::copy(*this, r);
}
-AsyncResultHandle::~AsyncResultHandle()
-{
+AsyncResultHandle::~AsyncResultHandle() {
PrivateImpl::dtor(*this);
}
AsyncResultHandle&
-AsyncResultHandle::operator=(const AsyncResultHandle& r)
-{
+AsyncResultHandle::operator=(const AsyncResultHandle& r) {
return PrivateImpl::assign(*this, r);
}
int
-AsyncResultHandle::getErrNo() const
-{
+AsyncResultHandle::getErrNo() const {
return impl->getErrNo();
}
std::string
-AsyncResultHandle::getErrMsg() const
-{
+AsyncResultHandle::getErrMsg() const {
return impl->getErrMsg();
}
boost::shared_ptr<BrokerAsyncContext>
-AsyncResultHandle::getBrokerAsyncContext() const
-{
+AsyncResultHandle::getBrokerAsyncContext() const {
return impl->getBrokerAsyncContext();
}
void
-AsyncResultHandle::invokeAsyncResultCallback() const
-{
+AsyncResultHandle::invokeAsyncResultCallback() const {
impl->getBrokerAsyncContext()->invokeCallback(this);
}
diff --git a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
index c8950d8ff1..2239902566 100644
--- a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
@@ -45,24 +45,20 @@ AsyncResultHandleImpl::AsyncResultHandleImpl(const int errNo,
m_bc(bc)
{}
-AsyncResultHandleImpl::~AsyncResultHandleImpl()
-{}
+AsyncResultHandleImpl::~AsyncResultHandleImpl() {}
int
-AsyncResultHandleImpl::getErrNo() const
-{
+AsyncResultHandleImpl::getErrNo() const {
return m_errNo;
}
std::string
-AsyncResultHandleImpl::getErrMsg() const
-{
+AsyncResultHandleImpl::getErrMsg() const {
return m_errMsg;
}
boost::shared_ptr<BrokerAsyncContext>
-AsyncResultHandleImpl::getBrokerAsyncContext() const
-{
+AsyncResultHandleImpl::getBrokerAsyncContext() const {
return m_bc;
}
diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
index ab408be9ca..9f8188f8c7 100644
--- a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
@@ -36,21 +36,18 @@ AsyncResultQueueImpl::AsyncResultQueueImpl(const boost::shared_ptr<qpid::sys::Po
m_resQueue.start();
}
-AsyncResultQueueImpl::~AsyncResultQueueImpl()
-{
+AsyncResultQueueImpl::~AsyncResultQueueImpl() {
m_resQueue.stop();
}
void
-AsyncResultQueueImpl::submit(boost::shared_ptr<AsyncResultHandle> arh)
-{
+AsyncResultQueueImpl::submit(boost::shared_ptr<AsyncResultHandle> arh) {
m_resQueue.push(arh);
}
// private
AsyncResultQueueImpl::ResultQueue::Batch::const_iterator
-AsyncResultQueueImpl::handle(const ResultQueue::Batch& e)
-{
+AsyncResultQueueImpl::handle(const ResultQueue::Batch& e) {
try {
for (ResultQueue::Batch::const_iterator i = e.begin(); i != e.end(); ++i) {
if ((*i)->isValid()) {
diff --git a/cpp/src/qpid/broker/ConfigHandle.cpp b/cpp/src/qpid/broker/ConfigHandle.cpp
index 6ac8ce6ace..17dfbd7369 100644
--- a/cpp/src/qpid/broker/ConfigHandle.cpp
+++ b/cpp/src/qpid/broker/ConfigHandle.cpp
@@ -44,14 +44,12 @@ ConfigHandle::ConfigHandle(const ConfigHandle& r) :
PrivateImpl::copy(*this, r);
}
-ConfigHandle::~ConfigHandle()
-{
+ConfigHandle::~ConfigHandle() {
PrivateImpl::dtor(*this);
}
ConfigHandle&
-ConfigHandle::operator=(const ConfigHandle& r)
-{
+ConfigHandle::operator=(const ConfigHandle& r) {
return PrivateImpl::assign(*this, r);
}
diff --git a/cpp/src/qpid/broker/EnqueueHandle.cpp b/cpp/src/qpid/broker/EnqueueHandle.cpp
index aff8673524..b305da4105 100644
--- a/cpp/src/qpid/broker/EnqueueHandle.cpp
+++ b/cpp/src/qpid/broker/EnqueueHandle.cpp
@@ -44,14 +44,12 @@ EnqueueHandle::EnqueueHandle(const EnqueueHandle& r) :
PrivateImpl::copy(*this, r);
}
-EnqueueHandle::~EnqueueHandle()
-{
+EnqueueHandle::~EnqueueHandle() {
PrivateImpl::dtor(*this);
}
EnqueueHandle&
-EnqueueHandle::operator=(const EnqueueHandle& r)
-{
+EnqueueHandle::operator=(const EnqueueHandle& r) {
return PrivateImpl::assign(*this, r);
}
diff --git a/cpp/src/qpid/broker/EventHandle.cpp b/cpp/src/qpid/broker/EventHandle.cpp
index 81f33b59a6..84934415b5 100644
--- a/cpp/src/qpid/broker/EventHandle.cpp
+++ b/cpp/src/qpid/broker/EventHandle.cpp
@@ -44,22 +44,19 @@ EventHandle::EventHandle(const EventHandle& r) :
PrivateImpl::copy(*this, r);
}
-EventHandle::~EventHandle()
-{
+EventHandle::~EventHandle() {
PrivateImpl::dtor(*this);
}
EventHandle&
-EventHandle::operator=(const EventHandle& r)
-{
+EventHandle::operator=(const EventHandle& r) {
return PrivateImpl::assign(*this, r);
}
// --- EventHandleImpl methods ---
const std::string&
-EventHandle::getKey() const
-{
+EventHandle::getKey() const {
return impl->getKey();
}
diff --git a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
index d72a785c2a..cb9c54d2d4 100644
--- a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
+++ b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
@@ -238,8 +238,7 @@ SimpleTxnBuffer::getNumOps() const {
// private
void
-SimpleTxnBuffer::createLocalXid()
-{
+SimpleTxnBuffer::createLocalXid() {
uuid_t uuid;
{
qpid::sys::ScopedLock<qpid::sys::Mutex> l(s_uuidMutex);
diff --git a/cpp/src/qpid/broker/TxnAsyncContext.cpp b/cpp/src/qpid/broker/TxnAsyncContext.cpp
index 527cb4741f..720f191b64 100644
--- a/cpp/src/qpid/broker/TxnAsyncContext.cpp
+++ b/cpp/src/qpid/broker/TxnAsyncContext.cpp
@@ -34,24 +34,20 @@ TxnAsyncContext::TxnAsyncContext(SimpleTxnBuffer* const tb,
m_arq(arq)
{}
-TxnAsyncContext::~TxnAsyncContext()
-{}
+TxnAsyncContext::~TxnAsyncContext() {}
SimpleTxnBuffer*
-TxnAsyncContext::getTxnBuffer() const
-{
+TxnAsyncContext::getTxnBuffer() const {
return m_tb;
}
AsyncResultQueue*
-TxnAsyncContext::getAsyncResultQueue() const
-{
+TxnAsyncContext::getAsyncResultQueue() const {
return m_arq;
}
void
-TxnAsyncContext::invokeCallback(const AsyncResultHandle* const arh) const
-{
+TxnAsyncContext::invokeCallback(const AsyncResultHandle* const arh) const {
if (m_rcb) {
m_rcb(arh);
}
diff --git a/cpp/src/qpid/broker/TxnHandle.cpp b/cpp/src/qpid/broker/TxnHandle.cpp
index f8977b2132..a13718b750 100644
--- a/cpp/src/qpid/broker/TxnHandle.cpp
+++ b/cpp/src/qpid/broker/TxnHandle.cpp
@@ -44,14 +44,12 @@ TxnHandle::TxnHandle(const TxnHandle& r) :
PrivateImpl::copy(*this, r);
}
-TxnHandle::~TxnHandle()
-{
+TxnHandle::~TxnHandle() {
PrivateImpl::dtor(*this);
}
TxnHandle&
-TxnHandle::operator=(const TxnHandle& r)
-{
+TxnHandle::operator=(const TxnHandle& r) {
return PrivateImpl::assign(*this, r);
}
diff --git a/cpp/src/tests/asyncstore.cmake b/cpp/src/tests/asyncstore.cmake
index 3dcd81c3d7..795ea55cf7 100644
--- a/cpp/src/tests/asyncstore.cmake
+++ b/cpp/src/tests/asyncstore.cmake
@@ -22,19 +22,17 @@
# New journal perf test (jrnl2Perf)
set (jrnl2Perf_SOURCES
- storePerftools/jrnlPerf/Journal.cpp
- storePerftools/jrnlPerf/JournalParameters.cpp
- storePerftools/jrnlPerf/PerfTest.cpp
- storePerftools/jrnlPerf/TestResult.cpp
+ storePerftools/jrnlPerf/Journal.cpp
+ storePerftools/jrnlPerf/JournalParameters.cpp
+ storePerftools/jrnlPerf/PerfTest.cpp
+ storePerftools/jrnlPerf/TestResult.cpp
- storePerftools/common/Parameters.cpp
storePerftools/common/PerftoolError.cpp
- storePerftools/common/ScopedTimable.cpp
- storePerftools/common/ScopedTimer.cpp
- storePerftools/common/Streamable.cpp
- storePerftools/common/TestParameters.cpp
- storePerftools/common/TestResult.cpp
- storePerftools/common/Thread.cpp
+ storePerftools/common/ScopedTimable.cpp
+ storePerftools/common/ScopedTimer.cpp
+ storePerftools/common/Streamable.cpp
+ storePerftools/common/TestParameters.cpp
+ storePerftools/common/Thread.cpp
)
if (UNIX)
@@ -47,33 +45,23 @@ if (UNIX)
qpidbroker
rt
)
+ add_test (Store_Perftools_Smoke_Test ${CMAKE_CURRENT_SOURCE_DIR}/storePerftools/storePerftoolsSmokeTest.sh)
endif (UNIX)
# Async store perf test (asyncPerf)
set (asyncStorePerf_SOURCES
storePerftools/asyncPerf/MessageConsumer.cpp
storePerftools/asyncPerf/MessageProducer.cpp
- storePerftools/asyncPerf/PerfTest.cpp
-# storePerftools/asyncPerf/SimpleDeliverable.cpp
-# storePerftools/asyncPerf/SimpleDeliveryRecord.cpp
-# storePerftools/asyncPerf/SimpleMessage.cpp
-# storePerftools/asyncPerf/SimpleMessageAsyncContext.cpp
-# storePerftools/asyncPerf/SimpleMessageDeque.cpp
-# storePerftools/asyncPerf/SimpleQueue.cpp
-# storePerftools/asyncPerf/SimpleQueuedMessage.cpp
-# storePerftools/asyncPerf/SimpleTxnAccept.cpp
-# storePerftools/asyncPerf/SimpleTxnPublish.cpp
- storePerftools/asyncPerf/TestOptions.cpp
- storePerftools/asyncPerf/TestResult.cpp
+ storePerftools/asyncPerf/PerfTest.cpp
+ storePerftools/asyncPerf/TestOptions.cpp
+ storePerftools/asyncPerf/TestResult.cpp
- storePerftools/common/Parameters.cpp
storePerftools/common/PerftoolError.cpp
- storePerftools/common/ScopedTimable.cpp
- storePerftools/common/ScopedTimer.cpp
- storePerftools/common/Streamable.cpp
- storePerftools/common/TestOptions.cpp
- storePerftools/common/TestResult.cpp
- storePerftools/common/Thread.cpp
+ storePerftools/common/ScopedTimable.cpp
+ storePerftools/common/ScopedTimer.cpp
+ storePerftools/common/Streamable.cpp
+ storePerftools/common/TestOptions.cpp
+ storePerftools/common/Thread.cpp
)
if (UNIX)
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
index 6477696bd6..cc24500800 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
@@ -43,7 +43,8 @@ MessageConsumer::MessageConsumer(const TestOptions& perfTestParams,
m_perfTestParams(perfTestParams),
m_store(store),
m_resultQueue(arq),
- m_queue(queue)
+ m_queue(queue),
+ m_stopFlag(false)
{}
MessageConsumer::~MessageConsumer() {}
@@ -56,6 +57,11 @@ MessageConsumer::record(boost::shared_ptr<qpid::broker::SimpleDeliveryRecord> dr
void
MessageConsumer::commitComplete() {}
+void
+MessageConsumer::stop() {
+ m_stopFlag = true;
+}
+
void*
MessageConsumer::runConsumers() {
const bool useTxns = m_perfTestParams.m_deqTxnBlockSize > 0U;
@@ -68,7 +74,7 @@ MessageConsumer::runConsumers() {
uint32_t msgsPerConsumer = m_perfTestParams.m_numEnqThreadsPerQueue * m_perfTestParams.m_numMsgs /
m_perfTestParams.m_numDeqThreadsPerQueue;
uint32_t numMsgs = 0UL;
- while (numMsgs < msgsPerConsumer) {
+ while (numMsgs < msgsPerConsumer && !m_stopFlag) {
if (m_queue->dispatch(*this)) {
++numMsgs;
if (useTxns) {
@@ -78,7 +84,7 @@ MessageConsumer::runConsumers() {
tb->enlist(ta);
if (++opsInTxnCnt >= m_perfTestParams.m_deqTxnBlockSize) {
tb->commitLocal(m_store);
- if (numMsgs < m_perfTestParams.m_numMsgs) {
+ if (numMsgs < msgsPerConsumer) {
tb = new qpid::broker::SimpleTxnBuffer(m_resultQueue);
}
opsInTxnCnt = 0U;
@@ -95,7 +101,7 @@ MessageConsumer::runConsumers() {
}
}
- if (opsInTxnCnt) {
+ if (opsInTxnCnt && !m_stopFlag) {
tb->commitLocal(m_store);
}
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h
index d5a881f7e0..93c1543b79 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.h
@@ -53,6 +53,7 @@ public:
virtual ~MessageConsumer();
void record(boost::shared_ptr<qpid::broker::SimpleDeliveryRecord> dr);
void commitComplete();
+ void stop();
void* runConsumers();
static void* startConsumers(void* ptr);
@@ -62,6 +63,7 @@ private:
qpid::broker::AsyncResultQueue& m_resultQueue;
boost::shared_ptr<qpid::broker::SimpleQueue> m_queue;
std::deque<boost::shared_ptr<qpid::broker::SimpleDeliveryRecord> > m_unacked;
+ bool m_stopFlag;
};
}}} // namespace tests::storePerftools::asyncPerf
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
index f88d305a38..b9a5e2a211 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
@@ -45,11 +45,17 @@ MessageProducer::MessageProducer(const TestOptions& perfTestParams,
m_msgData(msgData),
m_store(store),
m_resultQueue(arq),
- m_queue(queue)
+ m_queue(queue),
+ m_stopFlag(false)
{}
MessageProducer::~MessageProducer() {}
+void
+MessageProducer::stop() {
+ m_stopFlag = true;
+}
+
void*
MessageProducer::runProducers() {
const bool useTxns = m_perfTestParams.m_enqTxnBlockSize > 0U;
@@ -58,7 +64,7 @@ MessageProducer::runProducers() {
if (useTxns) {
tb = new qpid::broker::SimpleTxnBuffer(m_resultQueue);
}
- for (uint32_t numMsgs=0; numMsgs<m_perfTestParams.m_numMsgs; ++numMsgs) {
+ for (uint32_t numMsgs=0; numMsgs<m_perfTestParams.m_numMsgs && !m_stopFlag; ++numMsgs) {
boost::intrusive_ptr<qpid::broker::SimpleMessage> msg(new qpid::broker::SimpleMessage(m_msgData, m_perfTestParams.m_msgSize, m_store));
if (useTxns) {
boost::shared_ptr<qpid::broker::SimpleTxnPublish> op(new qpid::broker::SimpleTxnPublish(msg));
@@ -79,7 +85,7 @@ MessageProducer::runProducers() {
m_queue->deliver(msg);
}
}
- if (recsInTxnCnt) {
+ if (recsInTxnCnt && !m_stopFlag) {
tb->commitLocal(m_store);
}
return reinterpret_cast<void*>(0);
@@ -87,8 +93,7 @@ MessageProducer::runProducers() {
//static
void*
-MessageProducer::startProducers(void* ptr)
-{
+MessageProducer::startProducers(void* ptr) {
return reinterpret_cast<MessageProducer*>(ptr)->runProducers();
}
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h
index 6f98d03503..a6e6bb7f28 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.h
@@ -49,6 +49,8 @@ public:
qpid::broker::AsyncResultQueue& arq,
boost::shared_ptr<qpid::broker::SimpleQueue> queue);
virtual ~MessageProducer();
+ void stop();
+
void* runProducers();
static void* startProducers(void* ptr);
private:
@@ -57,6 +59,7 @@ private:
qpid::broker::AsyncStore* m_store;
qpid::broker::AsyncResultQueue& m_resultQueue;
boost::shared_ptr<qpid::broker::SimpleQueue> m_queue;
+ bool m_stopFlag;
};
}}} // namespace tests::storePerftools::asyncPerf
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
index c05eb0487d..3cd4eefbd9 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
@@ -170,32 +170,31 @@ runPerfTest(int argc, char** argv) {
opts.parse(argc, argv);
aso.validate();
to.validate();
- }
- catch (std::exception& e) {
- std::cerr << e.what() << std::endl;
- return 1;
- }
- // Handle options that just print information then exit.
- if (co.version) {
- std::cout << tests::storePerftools::name() << " v." << tests::storePerftools::version() << std::endl;
- return 0;
- }
- if (co.help) {
- std::cout << tests::storePerftools::name() << ": asyncPerf" << std::endl;
- std::cout << "Performance test for the async store through the qpid async store interface." << std::endl;
- std::cout << "Usage: asyncPerf [options]" << std::endl;
- std::cout << opts << std::endl;
- return 0;
- }
+ // Handle options that just print information then exit.
+ if (co.version) {
+ std::cout << tests::storePerftools::name() << " v." << tests::storePerftools::version() << std::endl;
+ return 0;
+ }
+ if (co.help) {
+ std::cout << tests::storePerftools::name() << ": asyncPerf" << std::endl;
+ std::cout << "Performance test for the async store through the qpid async store interface." << std::endl;
+ std::cout << "Usage: asyncPerf [options]" << std::endl;
+ std::cout << opts << std::endl;
+ return 0;
+ }
- // Create and start test
- tests::storePerftools::asyncPerf::PerfTest apt(to, aso);
- apt.run();
+ // Create and start test
+ tests::storePerftools::asyncPerf::PerfTest apt(to, aso);
+ apt.run();
- // Print test result
- std::cout << apt << std::endl;
- //::sleep(1);
+ // Print test result
+ std::cout << apt << std::endl;
+ //::sleep(1);
+ } catch (const std::exception& e) {
+ std::cerr << e.what() << std::endl;
+ return 1;
+ }
return 0;
}
diff --git a/cpp/src/tests/storePerftools/common/Parameters.cpp b/cpp/src/tests/storePerftools/common/Parameters.cpp
deleted file mode 100644
index 8e4bafaf86..0000000000
--- a/cpp/src/tests/storePerftools/common/Parameters.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * \file Parameters.cpp
- */
-
-#include "Parameters.h"
-
-namespace tests {
-namespace storePerftools {
-namespace common {
-
-Parameters::~Parameters()
-{}
-
-}}} // namespace tests::storePerftools::common
diff --git a/cpp/src/tests/storePerftools/common/Parameters.h b/cpp/src/tests/storePerftools/common/Parameters.h
index 941cce2dc6..cc3bf5d0f6 100644
--- a/cpp/src/tests/storePerftools/common/Parameters.h
+++ b/cpp/src/tests/storePerftools/common/Parameters.h
@@ -20,6 +20,7 @@
/**
* \file Parameters.h
*/
+
#ifndef tests_storePerftools_common_Parameters_h_
#define tests_storePerftools_common_Parameters_h_
@@ -32,7 +33,7 @@ namespace common {
class Parameters: public Streamable
{
public:
- virtual ~Parameters();
+ virtual ~Parameters() {}
virtual bool parseArg(const int arg,
const char* optarg) = 0;
diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.cpp b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
index 9edf384b07..8830447062 100644
--- a/cpp/src/tests/storePerftools/common/PerftoolError.cpp
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
@@ -92,49 +92,41 @@ PerftoolError::PerftoolError(const uint32_t errCode,
m_throwingFunction(throwingFunction)
{}
-PerftoolError::~PerftoolError() throw()
-{}
+PerftoolError::~PerftoolError() throw() {}
const char*
-PerftoolError::what() const throw ()
-{
+PerftoolError::what() const throw () {
return m_what.c_str();
}
uint32_t
-PerftoolError::getErrorCode() const throw ()
-{
+PerftoolError::getErrorCode() const throw () {
return m_errCode;
}
const std::string
-PerftoolError::getAdditionalInfo() const throw ()
-{
+PerftoolError::getAdditionalInfo() const throw () {
return m_errMsg;
}
const std::string
-PerftoolError::getThrowingClass() const throw ()
-{
+PerftoolError::getThrowingClass() const throw () {
return m_throwingClass;
}
const std::string
-PerftoolError::getThrowingFunction() const throw ()
-{
+PerftoolError::getThrowingFunction() const throw () {
return m_throwingFunction;
}
void
-PerftoolError::toStream(std::ostream& os) const
-{
+PerftoolError::toStream(std::ostream& os) const {
os << what();
}
// private
void
-PerftoolError::formatWhatStr() throw ()
-{
+PerftoolError::formatWhatStr() throw () {
try {
const bool ai = !m_errMsg.empty();
const bool tc = !m_throwingClass.empty();
@@ -164,8 +156,7 @@ PerftoolError::formatWhatStr() throw ()
// private
const char*
-PerftoolError::className()
-{
+PerftoolError::className() {
return s_className;
}
@@ -182,8 +173,7 @@ const uint32_t PerftoolError::PERR_PTHREAD = 0x0001;
// static
const char*
-PerftoolError::s_errorMessage(const uint32_t err_no) throw ()
-{
+PerftoolError::s_errorMessage(const uint32_t err_no) throw () {
s_errorMapIterator = s_errorMap.find(err_no);
if (s_errorMapIterator == s_errorMap.end())
return "<Unknown error code>";
@@ -192,8 +182,7 @@ PerftoolError::s_errorMessage(const uint32_t err_no) throw ()
// private static
bool
-PerftoolError::s_initialize()
-{
+PerftoolError::s_initialize() {
s_errorMap[PERR_PTHREAD] = "ERR_PTHREAD: pthread operation failure";
return true;
diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.h b/cpp/src/tests/storePerftools/common/PerftoolError.h
index 913bbbb7be..268835b58d 100644
--- a/cpp/src/tests/storePerftools/common/PerftoolError.h
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.h
@@ -61,7 +61,8 @@ namespace tests {
namespace storePerftools {
namespace common {
-class PerftoolError: public std::runtime_error, public Streamable
+class PerftoolError: public std::runtime_error,
+ public Streamable
{
public:
// --- Constructors & destructors ---
diff --git a/cpp/src/tests/storePerftools/common/ScopedTimable.cpp b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
index c2023b7854..924879411f 100644
--- a/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
@@ -31,12 +31,10 @@ ScopedTimable::ScopedTimable() :
m_elapsed(0.0)
{}
-ScopedTimable::~ScopedTimable()
-{}
+ScopedTimable::~ScopedTimable() {}
double&
-ScopedTimable::getElapsedRef()
-{
+ScopedTimable::getElapsedRef() {
return m_elapsed;
}
diff --git a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
index 143588941c..b919ea21ce 100644
--- a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
@@ -41,16 +41,14 @@ ScopedTimer::ScopedTimer(ScopedTimable& st) :
::clock_gettime(CLOCK_REALTIME, &m_startTime);
}
-ScopedTimer::~ScopedTimer()
-{
+ScopedTimer::~ScopedTimer() {
::timespec stopTime;
::clock_gettime(CLOCK_REALTIME, &stopTime);
m_elapsed = _s_getDoubleTime(stopTime) - _s_getDoubleTime(m_startTime);
}
// private static
-double ScopedTimer::_s_getDoubleTime(const ::timespec& ts)
-{
+double ScopedTimer::_s_getDoubleTime(const ::timespec& ts) {
return ts.tv_sec + (double(ts.tv_nsec) / 1e9);
}
diff --git a/cpp/src/tests/storePerftools/common/Streamable.cpp b/cpp/src/tests/storePerftools/common/Streamable.cpp
index 8c58f1c03e..8b5427c508 100644
--- a/cpp/src/tests/storePerftools/common/Streamable.cpp
+++ b/cpp/src/tests/storePerftools/common/Streamable.cpp
@@ -30,23 +30,20 @@ namespace storePerftools {
namespace common {
std::string
-Streamable::toString() const
-{
+Streamable::toString() const {
std::ostringstream oss;
toStream(oss);
return oss.str();
}
std::ostream&
-operator<<(std::ostream& os, const Streamable& s)
-{
+operator<<(std::ostream& os, const Streamable& s) {
s.toStream(os);
return os;
}
std::ostream&
-operator<<(std::ostream& os, const Streamable* sPtr)
-{
+operator<<(std::ostream& os, const Streamable* sPtr) {
sPtr->toStream(os);
return os;
}
diff --git a/cpp/src/tests/storePerftools/common/TestOptions.cpp b/cpp/src/tests/storePerftools/common/TestOptions.cpp
index 5e72fafc6f..c0c8b284d3 100644
--- a/cpp/src/tests/storePerftools/common/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/common/TestOptions.cpp
@@ -61,12 +61,10 @@ TestOptions::TestOptions(const uint32_t numMsgs,
doAddOptions();
}
-TestOptions::~TestOptions()
-{}
+TestOptions::~TestOptions() {}
void
-TestOptions::printVals(std::ostream& os) const
-{
+TestOptions::printVals(std::ostream& os) const {
os << "TEST OPTIONS:" << std::endl;
os << " Number of queues [-q, --num-queues]: " << m_numQueues << std::endl;
os << " Number of producers per queue [-p, --num-producers]: " << m_numEnqThreadsPerQueue << std::endl;
@@ -76,8 +74,7 @@ TestOptions::printVals(std::ostream& os) const
}
void
-TestOptions::validate()
-{
+TestOptions::validate() {
if (((m_numEnqThreadsPerQueue * m_numMsgs) % m_numDeqThreadsPerQueue) != 0) {
throw qpid::Exception("Parameter Error: (num-producers * num-msgs) must be a multiple of num-consumers.");
}
@@ -85,8 +82,7 @@ TestOptions::validate()
// private
void
-TestOptions::doAddOptions()
-{
+TestOptions::doAddOptions() {
addOptions()
("num-queues,q", qpid::optValue(m_numQueues, "N"),
"Number of queues")
diff --git a/cpp/src/tests/storePerftools/common/TestParameters.cpp b/cpp/src/tests/storePerftools/common/TestParameters.cpp
index f36a2d3bda..e418eedefb 100644
--- a/cpp/src/tests/storePerftools/common/TestParameters.cpp
+++ b/cpp/src/tests/storePerftools/common/TestParameters.cpp
@@ -67,12 +67,10 @@ TestParameters::TestParameters(const TestParameters& tp):
m_numDeqThreadsPerQueue(tp.m_numDeqThreadsPerQueue)
{}
-TestParameters::~TestParameters()
-{}
+TestParameters::~TestParameters() {}
void
-TestParameters::toStream(std::ostream& os) const
-{
+TestParameters::toStream(std::ostream& os) const {
os << "Test Parameters:" << std::endl;
os << " num_msgs = " << m_numMsgs << std::endl;
os << " msg_size = " << m_msgSize << std::endl;
@@ -83,8 +81,7 @@ TestParameters::toStream(std::ostream& os) const
bool
TestParameters::parseArg(const int arg,
- const char* optarg)
-{
+ const char* optarg) {
switch(arg) {
case 'm':
m_numMsgs = uint32_t(std::atol(optarg));
@@ -109,8 +106,7 @@ TestParameters::parseArg(const int arg,
// static
void
-TestParameters::printArgs(std::ostream& os)
-{
+TestParameters::printArgs(std::ostream& os) {
os << "Test parameters:" << std::endl;
os << " -m --num_msgs: Number of messages to send per enqueue thread ["
<< TestParameters::s_defaultNumMsgs << "]" << std::endl;
@@ -127,8 +123,7 @@ TestParameters::printArgs(std::ostream& os)
// static
std::string
-TestParameters::shortArgs()
-{
+TestParameters::shortArgs() {
return "m:S:q:e:d:";
}
diff --git a/cpp/src/tests/storePerftools/common/TestResult.cpp b/cpp/src/tests/storePerftools/common/TestResult.cpp
deleted file mode 100644
index c3e9d27dfc..0000000000
--- a/cpp/src/tests/storePerftools/common/TestResult.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * \file TestResult.cpp
- */
-
-#include "TestResult.h"
-
-namespace tests {
-namespace storePerftools {
-namespace common {
-
-TestResult::TestResult() :
- ScopedTimable(),
- Streamable()
-{}
-
-TestResult::~TestResult()
-{}
-
-}}} // namespace tests::storePerftools::common
diff --git a/cpp/src/tests/storePerftools/common/TestResult.h b/cpp/src/tests/storePerftools/common/TestResult.h
index e878164837..5092477397 100644
--- a/cpp/src/tests/storePerftools/common/TestResult.h
+++ b/cpp/src/tests/storePerftools/common/TestResult.h
@@ -34,8 +34,7 @@ namespace common {
class TestResult : public ScopedTimable, public Streamable
{
public:
- TestResult();
- virtual ~TestResult();
+ virtual ~TestResult() {}
void toStream(std::ostream& os = std::cout) const = 0;
};
diff --git a/cpp/src/tests/storePerftools/common/Thread.cpp b/cpp/src/tests/storePerftools/common/Thread.cpp
index 188e102e8f..cab7d77297 100644
--- a/cpp/src/tests/storePerftools/common/Thread.cpp
+++ b/cpp/src/tests/storePerftools/common/Thread.cpp
@@ -45,21 +45,19 @@ Thread::Thread(Thread::startFn_t sf,
PTHREAD_CHK(::pthread_create(&m_thread, NULL, sf, p), "::pthread_create", "Thread", "Thread");
}
-Thread::~Thread()
-{
+Thread::~Thread() {
if (m_running) {
PTHREAD_CHK(::pthread_detach(m_thread), "pthread_detach", "~Thread", "Thread");
}
}
const std::string&
-Thread::getId() const
-{
+Thread::getId() const {
return m_id;
}
-void Thread::join()
-{
+void
+Thread::join() {
PTHREAD_CHK(::pthread_join(m_thread, NULL), "pthread_join", "join", "Thread");
m_running = false;
}
diff --git a/cpp/src/tests/storePerftools/common/Thread.h b/cpp/src/tests/storePerftools/common/Thread.h
index 74d25a9da0..e133ddecc5 100644
--- a/cpp/src/tests/storePerftools/common/Thread.h
+++ b/cpp/src/tests/storePerftools/common/Thread.h
@@ -36,7 +36,8 @@ namespace common {
/**
* \brief Ultra-simple pthread class.
*/
-class Thread {
+class Thread
+{
public:
typedef void*(*startFn_t)(void*); ///< Thread entry point function pointer type
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
index 6efdc06fc8..8207249600 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
@@ -70,8 +70,7 @@ Journal::Journal(const uint32_t numMsgs,
m_jrnlPtr(jrnlPtr)
{}
-Journal::~Journal()
-{
+Journal::~Journal() {
delete m_jrnlPtr;
}
@@ -80,8 +79,7 @@ Journal::~Journal()
// This method will be called by multiple threads simultaneously
// Enqueue thread entry point
void*
-Journal::runEnqueues()
-{
+Journal::runEnqueues() {
bool misfireFlag = false;
uint32_t i = 0;
while (i < m_numMsgs) {
@@ -122,8 +120,7 @@ Journal::runEnqueues()
// This method will be called by multiple threads simultaneously
// Dequeue thread entry point
void*
-Journal::runDequeues()
-{
+Journal::runDequeues() {
uint32_t i = 0;
X_JRNL_IO_OP_RES jrnlIoRes;
while (i < m_numMsgs) {
@@ -170,23 +167,20 @@ Journal::runDequeues()
//static
void*
-Journal::startEnqueues(void* ptr)
-{
+Journal::startEnqueues(void* ptr) {
return reinterpret_cast<Journal*>(ptr)->runEnqueues();
}
//static
void*
-Journal:: startDequeues(void* ptr)
-{
+Journal:: startDequeues(void* ptr) {
return reinterpret_cast<Journal*>(ptr)->runDequeues();
}
// *** MUST BE THREAD-SAFE ****
// This method will be called by multiple threads simultaneously
void
-Journal::X_AIO_WR_CALLBACK(std::vector<X_DATA_TOKEN*>& msgTokenList)
-{
+Journal::X_AIO_WR_CALLBACK(std::vector<X_DATA_TOKEN*>& msgTokenList) {
X_DATA_TOKEN* mtokPtr;
while (msgTokenList.size()) {
mtokPtr = msgTokenList.back();
@@ -212,7 +206,6 @@ Journal::X_AIO_WR_CALLBACK(std::vector<X_DATA_TOKEN*>& msgTokenList)
// *** MUST BE THREAD-SAFE ****
// This method will be called by multiple threads simultaneously
void
-Journal::X_AIO_RD_CALLBACK(std::vector<uint16_t>& /*buffPageCtrlBlkIndexList*/)
-{}
+Journal::X_AIO_RD_CALLBACK(std::vector<uint16_t>& /*buffPageCtrlBlkIndexList*/) {}
}}} // namespace tests::storePerftools::jrnlPerf
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/Journal.h b/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
index 4803e4ecf6..4c02127af1 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
@@ -161,7 +161,6 @@ private:
std::vector<X_DATA_TOKEN*> m_unprocCallbacks; ///< List of unprocessed callbacks to be dequeued
X_SCOPED_MUTEX m_unprocCallbacksMutex; ///< Mutex which protects the unprocessed callback queue
-
};
}}} // namespace tests::storePerftools::jrnlPerf
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp b/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp
index 2b07619041..1d595f44ac 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp
@@ -93,12 +93,10 @@ JournalParameters::JournalParameters(const JournalParameters& jp) :
#endif
{}
-JournalParameters::~JournalParameters()
-{}
+JournalParameters::~JournalParameters() {}
void
-JournalParameters::toStream(std::ostream& os) const
-{
+JournalParameters::toStream(std::ostream& os) const {
os << "Journal Parameters:" << std::endl;
os << " jrnlDir = \"" << m_jrnlDir << "\"" << std::endl;
os << " jrnlBaseFileName = \"" << m_jrnlBaseFileName << "\"" << std::endl;
@@ -110,8 +108,7 @@ JournalParameters::toStream(std::ostream& os) const
bool
JournalParameters::parseArg(const int arg,
- const char* optarg)
-{
+ const char* optarg) {
switch(arg) {
case 'j':
m_jrnlDir.assign(optarg);
@@ -139,8 +136,7 @@ JournalParameters::parseArg(const int arg,
// static
void
-JournalParameters::printArgs(std::ostream& os)
-{
+JournalParameters::printArgs(std::ostream& os) {
os << "Journal parameters:" << std::endl;
os << " -j --jrnl_dir: Store directory [\""
<< JournalParameters::s_defaultJrnlDir << "\"]" << std::endl;
@@ -158,8 +154,7 @@ JournalParameters::printArgs(std::ostream& os)
// static
std::string
-JournalParameters::shortArgs()
-{
+JournalParameters::shortArgs() {
return "j:b:f:s:p:c:";
}
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
index ba7c95e821..6da0205e49 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
@@ -66,15 +66,13 @@ PerfTest::PerfTest(const tests::storePerftools::common::TestParameters& tp,
m_msgData(new char[tp.m_msgSize])
{}
-PerfTest::~PerfTest()
-{
+PerfTest::~PerfTest() {
delete[] m_msgData;
}
// private
void
-PerfTest::prepareJournals(std::vector<Journal*>& jrnlList)
-{
+PerfTest::prepareJournals(std::vector<Journal*>& jrnlList) {
#ifdef JOURNAL2
if (qpid::asyncStore::jrnl2::JournalDirectory::s_exists(m_jrnlParams.m_jrnlDir)) {
qpid::asyncStore::jrnl2::JournalDirectory::s_destroy(m_jrnlParams.m_jrnlDir);
@@ -114,8 +112,7 @@ PerfTest::prepareJournals(std::vector<Journal*>& jrnlList)
// private
void
-PerfTest::destroyJournals(std::vector<Journal*>& jrnlList)
-{
+PerfTest::destroyJournals(std::vector<Journal*>& jrnlList) {
while (jrnlList.size()) {
delete jrnlList.back();
jrnlList.pop_back();
@@ -123,8 +120,7 @@ PerfTest::destroyJournals(std::vector<Journal*>& jrnlList)
}
void
-PerfTest::run()
-{
+PerfTest::run() {
std::vector<Journal*> jrnlList;
prepareJournals(jrnlList);
@@ -154,16 +150,14 @@ PerfTest::run()
}
void
-PerfTest::toStream(std::ostream& os) const
-{
+PerfTest::toStream(std::ostream& os) const {
os << m_testParams << std::endl;
os << m_jrnlParams << std::endl;
os << m_testResult << std::endl;
}
void
-printArgs(std::ostream& os)
-{
+printArgs(std::ostream& os) {
os << " -h --help: This help message" << std::endl;
os << std::endl;
@@ -178,8 +172,7 @@ bool
readArgs(int argc,
char** argv,
tests::storePerftools::common::TestParameters& tp,
- JournalParameters& jp)
-{
+ JournalParameters& jp) {
/// \todo TODO: At some point, find an easy way to aggregate these from JrnlPerfTestParameters and JrnlParameters themselves.
static struct option long_options[] = {
{"help", no_argument, 0, 'h'},
@@ -231,8 +224,7 @@ readArgs(int argc,
// -----------------------------------------------------------------
int
-main(int argc, char** argv)
-{
+main(int argc, char** argv) {
tests::storePerftools::common::TestParameters tp;
tests::storePerftools::jrnlPerf::JournalParameters jp;
if (tests::storePerftools::jrnlPerf::readArgs(argc, argv, tp, jp)) return 1;
diff --git a/cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp
index 9fe214726d..b5d84a6ac4 100644
--- a/cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp
@@ -34,12 +34,10 @@ TestResult::TestResult(const tests::storePerftools::common::TestParameters& tp)
m_testParams(tp)
{}
-TestResult::~TestResult()
-{}
+TestResult::~TestResult() {}
void
-TestResult::toStream(std::ostream& os) const
-{
+TestResult::toStream(std::ostream& os) const {
double msgsRate;
os << "TEST RESULTS:" << std::endl;
os << " Msgs per thread: " << m_testParams.m_numMsgs << std::endl;
diff --git a/cpp/src/tests/storePerftools/storePerftoolsSmokeTest.sh b/cpp/src/tests/storePerftools/storePerftoolsSmokeTest.sh
new file mode 100755
index 0000000000..592e1e60a0
--- /dev/null
+++ b/cpp/src/tests/storePerftools/storePerftoolsSmokeTest.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+run_test() {
+ local cmd=$1
+ echo $cmd
+ $cmd
+ if (( $? != 0 )); then
+ exit 1
+ fi
+}
+
+NUM_MSGS=1000
+TEST_PROG="./asyncStorePerf"
+
+run_test "${TEST_PROG}"
+run_test "${TEST_PROG} --help"
+for q in 1 2; do
+ for p in 1 2; do
+ for c in 1 2; do
+ for e in 0 1 3; do
+ for d in 0 1 3; do
+ for dur in "" "--durable"; do
+ run_test "${TEST_PROG} --num-queues $q --num-msgs ${NUM_MSGS} --num-producers $p --num-consumers $c --enq-txn-size $e --deq-txn-size $d ${dur}"
+ done
+ done
+ done
+ done
+ done
+done
+
+
+NUM_MSGS=1000
+TEST_PROG="./jrnl2Perf"
+
+
+run_test "${TEST_PROG}"
+
+# This test returns 1, don't use run_test until this is fixed.
+cmd="${TEST_PROG} --help"
+echo $cmd
+$cmd
+
+for q in 1 2; do
+ for p in 1 2; do
+ for c in 1; do # BUG - this will fail for c > 1
+ run_test "./jrnl2Perf --num_queues $q --num_msgs ${NUM_MSGS} --num_enq_threads_per_queue $p --num_deq_threads_per_queue $c"
+ done
+ done
+done
+
+#exit 0
diff --git a/cpp/src/tests/storePerftools/version.h b/cpp/src/tests/storePerftools/version.h
index 311b145330..be28f5bc57 100644
--- a/cpp/src/tests/storePerftools/version.h
+++ b/cpp/src/tests/storePerftools/version.h
@@ -31,8 +31,8 @@ namespace tests {
namespace storePerftools {
static const int versionMajor = 0;
-static const int versionMinor = 0;
-static const int versionRevision = 1;
+static const int versionMinor = 1;
+static const int versionRevision = 0;
std::string name() {
return "Qpid async store perftools";