QPID-3858: Fix directory names to match namespaces in test dir; Changed MockPersistableQueue to use intrusive pointers.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/asyncstore@1338185 13f79535-47bb-0310-9956-ffa450edef68

42 files changed, 170 insertions, 158 deletions

diff --git a/cpp/src/tests/CMakeLists.txt b/cpp/src/tests/CMakeLists.txt
index 54fc4fdf2d..ba4f5d321e 100644
--- a/cpp/src/tests/CMakeLists.txt
+++ b/cpp/src/tests/CMakeLists.txt
@@ -350,19 +350,19 @@ add_library (dlclose_noop MODULE dlclose_noop.c)
 
 # 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/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
 )
 
 if (UNIX)
@@ -379,23 +379,23 @@ endif (UNIX)
 
 # Async store perf test (asyncPerf)
 set (asyncStorePerf_SOURCES
-	storePerfTools/asyncPerf/MockPersistableMessage.cpp
-	storePerfTools/asyncPerf/MockPersistableQueue.cpp
-	storePerfTools/asyncPerf/MockTransactionContext.cpp
-	storePerfTools/asyncPerf/PerfTest.cpp
-	storePerfTools/asyncPerf/QueuedMessage.cpp
-	storePerfTools/asyncPerf/TestOptions.cpp
-	storePerfTools/asyncPerf/TestResult.cpp
+	storePerftools/asyncPerf/MockPersistableMessage.cpp
+	storePerftools/asyncPerf/MockPersistableQueue.cpp
+	storePerftools/asyncPerf/MockTransactionContext.cpp
+	storePerftools/asyncPerf/PerfTest.cpp
+	storePerftools/asyncPerf/QueuedMessage.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/TestParameters.cpp
-	storePerfTools/common/TestResult.cpp
-	storePerfTools/common/Thread.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/TestParameters.cpp
+	storePerftools/common/TestResult.cpp
+	storePerftools/common/Thread.cpp
 )
 
 if (UNIX)
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableMessage.cpp b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.cpp
index 5cc829f4d2..5cc829f4d2 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableMessage.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.cpp
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableMessage.h b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.h
index fa9bc8e937..7039c4bd08 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableMessage.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableMessage.h
@@ -21,8 +21,8 @@
  * \file MockPersistableMessage.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_MockPersistableMessage_h_
-#define tests_storePerfTools_asyncPerf_MockPersistableMessage_h_
+#ifndef tests_storePerftools_asyncPerf_MockPersistableMessage_h_
+#define tests_storePerftools_asyncPerf_MockPersistableMessage_h_
 
 #include "qpid/asyncStore/AsyncOperation.h"
 #include "qpid/broker/AsyncStore.h" // qpid::broker::DataSource
@@ -101,4 +101,4 @@ protected:
 
 }}} // namespace tests::storePerftools::asyncPerf
 
-#endif // tests_storePerfTools_asyncPerf_MockPersistableMessage_h_
+#endif // tests_storePerfools_asyncPerf_MockPersistableMessage_h_
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.cpp
index 69af020a26..c1d637f621 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.cpp
@@ -37,21 +37,36 @@ namespace asyncPerf {
 
 // --- Inner class MockPersistableQueue::QueueContext ---
 
-MockPersistableQueue::QueueContext::QueueContext(MockPersistableQueuePtr q,
+MockPersistableQueue::QueueContext::QueueContext(intrusive_ptr q,
                                                  const qpid::asyncStore::AsyncOperation::opCode op) :
+        qpid::broker::BrokerContext(),
         m_q(q),
         m_op(op)
-{}
+{
+    assert(m_q.get() != 0);
+}
 
 MockPersistableQueue::QueueContext::~QueueContext()
 {}
 
+qpid::asyncStore::AsyncOperation::opCode
+MockPersistableQueue::QueueContext::getOpCode() const
+{
+    return m_op;
+}
+
 const char*
-MockPersistableQueue::QueueContext::getOp() const
+MockPersistableQueue::QueueContext::getOpStr() const
 {
     return qpid::asyncStore::AsyncOperation::getOpStr(m_op);
 }
 
+MockPersistableQueue::intrusive_ptr
+MockPersistableQueue::QueueContext::getQueue() const
+{
+    return m_q;
+}
+
 void
 MockPersistableQueue::QueueContext::destroy()
 {
@@ -92,29 +107,27 @@ MockPersistableQueue::handleAsyncResult(const qpid::broker::AsyncResult* res,
 {
     if (bc && res) {
         QueueContext* qc = dynamic_cast<QueueContext*>(bc);
-        if (qc->m_q) {
-            if (res->errNo) {
-                // TODO: Handle async failure here
-                std::cerr << "Queue name=\"" << qc->m_q->m_name << "\": Operation " << qc->getOp() << ": failure "
-                          << res->errNo << " (" << res->errMsg << ")" << std::endl;
-            } else {
-                // Handle async success here
-                switch(qc->m_op) {
-                case qpid::asyncStore::AsyncOperation::QUEUE_CREATE:
-                    qc->m_q->createComplete(qc);
-                    break;
-                case qpid::asyncStore::AsyncOperation::QUEUE_FLUSH:
-                    qc->m_q->flushComplete(qc);
-                    break;
-                case qpid::asyncStore::AsyncOperation::QUEUE_DESTROY:
-                    qc->m_q->destroyComplete(qc);
-                    break;
-                default:
-                    std::ostringstream oss;
-                    oss << "tests::storePerftools::asyncPerf::MockPersistableQueue::handleAsyncResult(): Unknown async queue operation: " << qc->m_op;
-                    throw qpid::Exception(oss.str());
-                };
-            }
+        if (res->errNo) {
+            // TODO: Handle async failure here
+            std::cerr << "Queue name=\"" << qc->getQueue()->m_name << "\": Operation " << qc->getOpStr() << ": failure "
+                      << res->errNo << " (" << res->errMsg << ")" << std::endl;
+        } else {
+            // Handle async success here
+            switch(qc->getOpCode()) {
+            case qpid::asyncStore::AsyncOperation::QUEUE_CREATE:
+                qc->getQueue()->createComplete(qc);
+                break;
+            case qpid::asyncStore::AsyncOperation::QUEUE_FLUSH:
+                qc->getQueue()->flushComplete(qc);
+                break;
+            case qpid::asyncStore::AsyncOperation::QUEUE_DESTROY:
+                qc->getQueue()->destroyComplete(qc);
+                break;
+            default:
+                std::ostringstream oss;
+                oss << "tests::storePerftools::asyncPerf::MockPersistableQueue::handleAsyncResult(): Unknown async queue operation: " << qc->getOpCode();
+                throw qpid::Exception(oss.str());
+            };
         }
     }
     if (bc) delete bc;
@@ -127,23 +140,21 @@ MockPersistableQueue::getHandle()
     return m_queueHandle;
 }
 
-// static
 void
-MockPersistableQueue::asyncStoreCreate(MockPersistableQueuePtr& qp)
+MockPersistableQueue::asyncStoreCreate()
 {
-    qp->m_store->submitCreate(qp->m_queueHandle,
-                              dynamic_cast<const qpid::broker::DataSource*>(qp.get()),
-                              &handleAsyncResult,
-                              new QueueContext(qp, qpid::asyncStore::AsyncOperation::QUEUE_CREATE));
+    m_store->submitCreate(m_queueHandle,
+                          this,
+                          &handleAsyncResult,
+                          new QueueContext(this, qpid::asyncStore::AsyncOperation::QUEUE_CREATE));
 }
 
-// static
 void
-MockPersistableQueue::asyncStoreDestroy(MockPersistableQueuePtr& qp)
+MockPersistableQueue::asyncStoreDestroy()
 {
-    qp->m_store->submitDestroy(qp->m_queueHandle,
-                               &handleAsyncResult,
-                               new QueueContext(qp, qpid::asyncStore::AsyncOperation::QUEUE_DESTROY));
+    m_store->submitDestroy(m_queueHandle,
+                           &handleAsyncResult,
+                           new QueueContext(this, qpid::asyncStore::AsyncOperation::QUEUE_DESTROY));
 }
 
 void*
@@ -307,7 +318,7 @@ void
 MockPersistableQueue::createComplete(const QueueContext* qc)
 {
 //std::cout << "~~~~~ Queue name=\"" << qc->m_q->getName() << "\": createComplete()" << std::endl << std::flush;
-    assert(qc->m_q.get() == this);
+    assert(qc->getQueue().get() == this);
 }
 
 // protected
@@ -315,7 +326,7 @@ void
 MockPersistableQueue::flushComplete(const QueueContext* qc)
 {
 //std::cout << "~~~~~ Queue name=\"" << qc->m_q->getName() << "\": flushComplete()" << std::endl << std::flush;
-    assert(qc->m_q.get() == this);
+    assert(qc->getQueue().get() == this);
 }
 
 // protected
@@ -323,7 +334,7 @@ void
 MockPersistableQueue::destroyComplete(const QueueContext* qc)
 {
 //std::cout << "~~~~~ Queue name=\"" << qc->m_q->getName() << "\": destroyComplete()" << std::endl << std::flush;
-    assert(qc->m_q.get() == this);
+    assert(qc->getQueue().get() == this);
 }
 
 // protected
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.h b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.h
index c3b461477c..2e06b0256e 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/MockPersistableQueue.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockPersistableQueue.h
@@ -21,8 +21,8 @@
  * \file MockPersistableQueue.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_MockPersistableQueue_h_
-#define tests_storePerfTools_asyncPerf_MockPersistableQueue_h_
+#ifndef tests_storePerftools_asyncPerf_MockPersistableQueue_h_
+#define tests_storePerftools_asyncPerf_MockPersistableQueue_h_
 
 #include "qpid/asyncStore/AsyncOperation.h"
 #include "qpid/broker/AsyncStore.h" // qpid::broker::DataSource
@@ -32,6 +32,7 @@
 #include "qpid/sys/Condition.h"
 #include "qpid/sys/Mutex.h"
 
+#include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
 #include <deque>
 
@@ -47,25 +48,28 @@ namespace tests {
 namespace storePerftools {
 namespace asyncPerf {
 
-class MockPersistableQueue;
 class QueuedMessage;
 class TestOptions;
 
-typedef boost::shared_ptr<MockPersistableQueue> MockPersistableQueuePtr;
 typedef boost::shared_ptr<QueuedMessage> QueuedMessagePtr;
 
 class MockPersistableQueue : public qpid::broker::PersistableQueue, public qpid::broker::DataSource
 {
 public:
+    typedef boost::intrusive_ptr<MockPersistableQueue> intrusive_ptr;
+
     class QueueContext : public qpid::broker::BrokerContext
     {
     public:
-        QueueContext(MockPersistableQueuePtr q,
+        QueueContext(intrusive_ptr q,
                      const qpid::asyncStore::AsyncOperation::opCode op);
         virtual ~QueueContext();
-        const char* getOp() const;
+        qpid::asyncStore::AsyncOperation::opCode getOpCode() const;
+        const char* getOpStr() const;
+        intrusive_ptr getQueue() const;
         void destroy();
-        MockPersistableQueuePtr m_q;
+    protected:
+        intrusive_ptr m_q;
         const qpid::asyncStore::AsyncOperation::opCode m_op;
     };
 
@@ -80,8 +84,8 @@ public:
     static void handleAsyncResult(const qpid::broker::AsyncResult* res,
                                   qpid::broker::BrokerContext* bc);
     qpid::broker::QueueHandle& getHandle();
-    static void asyncStoreCreate(MockPersistableQueuePtr& qp);
-    static void asyncStoreDestroy(MockPersistableQueuePtr& qp);
+    void asyncStoreCreate();
+    void asyncStoreDestroy();
 
     // --- Performance test thread entry points ---
     void* runEnqueues();
@@ -133,4 +137,4 @@ protected:
 
 }}} // namespace tests::storePerftools::asyncPerf
 
-#endif // tests_storePerfTools_asyncPerf_MockPersistableQueue_h_
+#endif // tests_storePerftools_asyncPerf_MockPersistableQueue_h_
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/MockTransactionContext.cpp b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.cpp
index 10be34c6f5..10be34c6f5 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/MockTransactionContext.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.cpp
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/MockTransactionContext.h b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.h
index 3c467a7b5d..883da198bb 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/MockTransactionContext.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/MockTransactionContext.h
@@ -21,8 +21,8 @@
  * \file MockTransactionContext.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_MockTransactionContext_h_
-#define tests_storePerfTools_asyncPerf_MockTransactionContext_h_
+#ifndef tests_storePerftools_asyncPerf_MockTransactionContext_h_
+#define tests_storePerftools_asyncPerf_MockTransactionContext_h_
 
 #include "qpid/asyncStore/AsyncOperation.h"
 
@@ -96,4 +96,4 @@ protected:
 
 }}} // namespace tests:storePerftools::asyncPerf
 
-#endif // tests_storePerfTools_asyncPerf_MockTransactionContext_h_
+#endif // tests_storePerftools_asyncPerf_MockTransactionContext_h_
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
index 983f088616..7387c348fd 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
@@ -25,9 +25,9 @@
 
 #include "MockPersistableQueue.h"
 
-#include "tests/storePerfTools/version.h"
-#include "tests/storePerfTools/common/ScopedTimer.h"
-#include "tests/storePerfTools/common/Thread.h"
+#include "tests/storePerftools/version.h"
+#include "tests/storePerftools/common/ScopedTimer.h"
+#include "tests/storePerftools/common/Thread.h"
 
 #include "qpid/asyncStore/AsyncStoreImpl.h"
 
@@ -74,8 +74,8 @@ PerfTest::prepareQueues()
     for (uint16_t i = 0; i < m_testOpts.m_numQueues; ++i) {
         std::ostringstream qname;
         qname << "queue_" << std::setw(4) << std::setfill('0') << i;
-        MockPersistableQueuePtr mpq(new MockPersistableQueue(qname.str(), m_queueArgs, m_store, m_testOpts, m_msgData));
-        mpq->asyncStoreCreate(mpq);
+        MockPersistableQueue::intrusive_ptr mpq(new MockPersistableQueue(qname.str(), m_queueArgs, m_store, m_testOpts, m_msgData));
+        mpq->asyncStoreCreate();
         m_queueList.push_back(mpq);
     }
 }
@@ -83,8 +83,8 @@ PerfTest::prepareQueues()
 void
 PerfTest::destroyQueues()
 {
-    for (std::deque<MockPersistableQueuePtr>::iterator i=m_queueList.begin(); i!=m_queueList.end(); ++i) {
-        (*i)->asyncStoreDestroy(*i);
+    for (std::deque<MockPersistableQueue::intrusive_ptr>::iterator i=m_queueList.begin(); i!=m_queueList.end(); ++i) {
+        (*i)->asyncStoreDestroy();
     }
 }
 
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/PerfTest.h b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
index 544cd6b3ae..2b1e65f871 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/PerfTest.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
@@ -21,12 +21,13 @@
  * \file PerfTest.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_PerfTest_h_
-#define tests_storePerfTools_asyncPerf_PerfTest_h_
+#ifndef tests_storePerftools_asyncPerf_PerfTest_h_
+#define tests_storePerftools_asyncPerf_PerfTest_h_
 
+#include "MockPersistableQueue.h"
 #include "TestResult.h"
 
-#include "tests/storePerfTools/common/Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Poller.h"
@@ -45,12 +46,8 @@ namespace tests {
 namespace storePerftools {
 namespace asyncPerf {
 
-class MockPersistableQueue;
 class TestOptions;
 
-//typedef boost::shared_ptr<qpid::asyncStore::AsyncStoreImpl> AsyncStoreImplPtr;
-typedef boost::shared_ptr<MockPersistableQueue> MockPersistableQueuePtr;
-
 class PerfTest : public tests::storePerftools::common::Streamable
 {
 public:
@@ -69,7 +66,7 @@ protected:
     boost::shared_ptr<qpid::sys::Poller> m_poller;
     qpid::sys::Thread m_pollingThread;
     qpid::asyncStore::AsyncStoreImpl* m_store;
-    std::deque<MockPersistableQueuePtr> m_queueList;
+    std::deque<MockPersistableQueue::intrusive_ptr> m_queueList;
 
     void prepareStore();
     void prepareQueues();
@@ -79,4 +76,4 @@ protected:
 
 }}} // namespace tests::storePerftools::asyncPerf
 
-#endif // tests_storePerfTools_asyncPerf_PerfTest_h_
+#endif // tests_storePerftools_asyncPerf_PerfTest_h_
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/QueuedMessage.cpp b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
index 315e202d8b..315e202d8b 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/QueuedMessage.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.cpp
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/QueuedMessage.h b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
index 4b3dab67f9..be9694f6e5 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/QueuedMessage.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
@@ -21,8 +21,8 @@
  * \file QueuedMessage.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_QueuedMessage_h_
-#define tests_storePerfTools_asyncPerf_QueuedMessage_h_
+#ifndef tests_storePerftools_asyncPerf_QueuedMessage_h_
+#define tests_storePerftools_asyncPerf_QueuedMessage_h_
 
 #include "qpid/broker/EnqueueHandle.h"
 #include <boost/shared_ptr.hpp>
@@ -58,4 +58,4 @@ protected:
 
 }}} // namespace tests::storePerfTools
 
-#endif // tests_storePerfTools_asyncPerf_QueuedMessage_h_
+#endif // tests_storePerftools_asyncPerf_QueuedMessage_h_
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/TestOptions.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
index 27784ef661..27784ef661 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/TestOptions.h b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.h
index b0e1e4ce74..76b18717fa 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/TestOptions.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.h
@@ -21,10 +21,10 @@
  * \file TestOptions.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_TestOptions_h_
-#define tests_storePerfTools_asyncPerf_TestOptions_h_
+#ifndef tests_storePerftools_asyncPerf_TestOptions_h_
+#define tests_storePerftools_asyncPerf_TestOptions_h_
 
-#include "tests/storePerfTools/common/TestOptions.h"
+#include "tests/storePerftools/common/TestOptions.h"
 
 namespace tests {
 namespace storePerftools {
@@ -57,4 +57,4 @@ protected:
 
 }}} // namespace tests::storePerftools::asyncPerf
 
-#endif // tests_storePerfTools_asyncPerf_TestOptions_h_
+#endif // tests_storePerftools_asyncPerf_TestOptions_h_
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/TestResult.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
index cf6f293494..cf6f293494 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/TestResult.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
diff --git a/cpp/src/tests/storePerfTools/asyncPerf/TestResult.h b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
index 1310689ff8..1b831c3e17 100644
--- a/cpp/src/tests/storePerfTools/asyncPerf/TestResult.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
@@ -21,12 +21,12 @@
  * \file TestResult.h
  */
 
-#ifndef tests_storePerfTools_asyncPerf_TestResult_h_
-#define tests_storePerfTools_asyncPerf_TestResult_h_
+#ifndef tests_storePerftools_asyncPerf_TestResult_h_
+#define tests_storePerftools_asyncPerf_TestResult_h_
 
 #include "TestOptions.h"
 
-#include "tests/storePerfTools/common/TestResult.h"
+#include "tests/storePerftools/common/TestResult.h"
 
 namespace tests {
 namespace storePerftools {
@@ -90,4 +90,4 @@ protected:
 
 }}} // namespace tests::storePerftools::asyncPerf
 
-#endif // tests_storePerfTools_asyncPerf_TestResult_h_
+#endif // tests_storePerftools_asyncPerf_TestResult_h_
diff --git a/cpp/src/tests/storePerfTools/common/Parameters.cpp b/cpp/src/tests/storePerftools/common/Parameters.cpp
index 8e4bafaf86..8e4bafaf86 100644
--- a/cpp/src/tests/storePerfTools/common/Parameters.cpp
+++ b/cpp/src/tests/storePerftools/common/Parameters.cpp
diff --git a/cpp/src/tests/storePerfTools/common/Parameters.h b/cpp/src/tests/storePerftools/common/Parameters.h
index 03dd2163f8..941cce2dc6 100644
--- a/cpp/src/tests/storePerfTools/common/Parameters.h
+++ b/cpp/src/tests/storePerftools/common/Parameters.h
@@ -20,8 +20,8 @@
 /**
  * \file Parameters.h
  */
-#ifndef tests_storePerfTools_common_Parameters_h_
-#define tests_storePerfTools_common_Parameters_h_
+#ifndef tests_storePerftools_common_Parameters_h_
+#define tests_storePerftools_common_Parameters_h_
 
 #include "Streamable.h"
 
@@ -40,4 +40,4 @@ public:
 
 }}} // namespace tests::storePerfTools::common
 
-#endif // tests_storePerfTools_common_Parameters_h_
+#endif // tests_storePerftools_common_Parameters_h_
diff --git a/cpp/src/tests/storePerfTools/common/PerftoolError.cpp b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
index 5bb61b6519..5bb61b6519 100644
--- a/cpp/src/tests/storePerfTools/common/PerftoolError.cpp
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
diff --git a/cpp/src/tests/storePerfTools/common/PerftoolError.h b/cpp/src/tests/storePerftools/common/PerftoolError.h
index 8f994d7d28..d4740f8d1d 100644
--- a/cpp/src/tests/storePerfTools/common/PerftoolError.h
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.h
@@ -21,8 +21,8 @@
  * \file PerftoolError.h
  */
 
-#ifndef tests_storePerfTools_common_PerftoolError_h_
-#define tests_storePerfTools_common_PerftoolError_h_
+#ifndef tests_storePerftools_common_PerftoolError_h_
+#define tests_storePerftools_common_PerftoolError_h_
 
 #include "Streamable.h"
 
@@ -124,4 +124,4 @@ private:
 
 }}} // namespace tests::stprePerftools::common
 
-#endif // tests_storePerfTools_common_PerftoolError_h_
+#endif // tests_storePerftools_common_PerftoolError_h_
diff --git a/cpp/src/tests/storePerfTools/common/ScopedTimable.cpp b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
index c2023b7854..c2023b7854 100644
--- a/cpp/src/tests/storePerfTools/common/ScopedTimable.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
diff --git a/cpp/src/tests/storePerfTools/common/ScopedTimable.h b/cpp/src/tests/storePerftools/common/ScopedTimable.h
index 3c21a4aafa..73d12b77f6 100644
--- a/cpp/src/tests/storePerfTools/common/ScopedTimable.h
+++ b/cpp/src/tests/storePerftools/common/ScopedTimable.h
@@ -21,8 +21,8 @@
  * \file ScopedTimable.h
  */
 
-#ifndef tests_storePerfTools_common_ScopedTimable_h_
-#define tests_storePerfTools_common_ScopedTimable_h_
+#ifndef tests_storePerftools_common_ScopedTimable_h_
+#define tests_storePerftools_common_ScopedTimable_h_
 
 namespace tests {
 namespace storePerftools {
@@ -53,4 +53,4 @@ protected:
 
 }}} // namespace tests::storePerftools::common
 
-#endif // tests_storePerfTools_common_ScopedTimable_h_
+#endif // tests_storePerftools_common_ScopedTimable_h_
diff --git a/cpp/src/tests/storePerfTools/common/ScopedTimer.cpp b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
index 8312174cad..8312174cad 100644
--- a/cpp/src/tests/storePerfTools/common/ScopedTimer.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
diff --git a/cpp/src/tests/storePerfTools/common/ScopedTimer.h b/cpp/src/tests/storePerftools/common/ScopedTimer.h
index c23d056f10..dd056cf726 100644
--- a/cpp/src/tests/storePerfTools/common/ScopedTimer.h
+++ b/cpp/src/tests/storePerftools/common/ScopedTimer.h
@@ -21,8 +21,8 @@
  * \file ScopedTimer.h
  */
 
-#ifndef tests_storePerfTools_common_ScopedTimer_h_
-#define tests_storePerfTools_common_ScopedTimer_h_
+#ifndef tests_storePerftools_common_ScopedTimer_h_
+#define tests_storePerftools_common_ScopedTimer_h_
 
 #include <ctime>
 
@@ -88,4 +88,4 @@ protected:
 
 }}} // namespace tests::storePerftools::common
 
-#endif // tests_storePerfTools_common_ScopedTimer_h_
+#endif // tests_storePerftools_common_ScopedTimer_h_
diff --git a/cpp/src/tests/storePerfTools/common/Streamable.cpp b/cpp/src/tests/storePerftools/common/Streamable.cpp
index 8c58f1c03e..8c58f1c03e 100644
--- a/cpp/src/tests/storePerfTools/common/Streamable.cpp
+++ b/cpp/src/tests/storePerftools/common/Streamable.cpp
diff --git a/cpp/src/tests/storePerfTools/common/Streamable.h b/cpp/src/tests/storePerftools/common/Streamable.h
index 504a3d97dd..5fb6d5862b 100644
--- a/cpp/src/tests/storePerfTools/common/Streamable.h
+++ b/cpp/src/tests/storePerftools/common/Streamable.h
@@ -21,8 +21,8 @@
  * \file Streamable.h
  */
 
-#ifndef tests_storePerfTools_common_Streamable_h_
-#define tests_storePerfTools_common_Streamable_h_
+#ifndef tests_storePerftools_common_Streamable_h_
+#define tests_storePerftools_common_Streamable_h_
 
 #include <iostream>
 
@@ -76,4 +76,4 @@ public:
 
 }}} // namespace tests::storePerftools::common
 
-#endif // tests_storePerfTools_common_Streamable_h_
+#endif // tests_storePerftools_common_Streamable_h_
diff --git a/cpp/src/tests/storePerfTools/common/TestOptions.cpp b/cpp/src/tests/storePerftools/common/TestOptions.cpp
index 39e3434a6c..39e3434a6c 100644
--- a/cpp/src/tests/storePerfTools/common/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/common/TestOptions.cpp
diff --git a/cpp/src/tests/storePerfTools/common/TestOptions.h b/cpp/src/tests/storePerftools/common/TestOptions.h
index 6a4479fa56..217e0ca2f9 100644
--- a/cpp/src/tests/storePerfTools/common/TestOptions.h
+++ b/cpp/src/tests/storePerftools/common/TestOptions.h
@@ -21,8 +21,8 @@
  * \file TestOptions.h
  */
 
-#ifndef tests_storePerfTools_common_TestOptions_h_
-#define tests_storePerfTools_common_TestOptions_h_
+#ifndef tests_storePerftools_common_TestOptions_h_
+#define tests_storePerftools_common_TestOptions_h_
 
 #include "qpid/Options.h"
 
@@ -63,4 +63,4 @@ protected:
 
 }}} // namespace tests::storePerftools::common
 
-#endif // tests_storePerfTools_common_TestOptions_h_
+#endif // tests_storePerftools_common_TestOptions_h_
diff --git a/cpp/src/tests/storePerfTools/common/TestParameters.cpp b/cpp/src/tests/storePerftools/common/TestParameters.cpp
index f36a2d3bda..f36a2d3bda 100644
--- a/cpp/src/tests/storePerfTools/common/TestParameters.cpp
+++ b/cpp/src/tests/storePerftools/common/TestParameters.cpp
diff --git a/cpp/src/tests/storePerfTools/common/TestParameters.h b/cpp/src/tests/storePerftools/common/TestParameters.h
index ea73589609..c9ebc8cefa 100644
--- a/cpp/src/tests/storePerfTools/common/TestParameters.h
+++ b/cpp/src/tests/storePerftools/common/TestParameters.h
@@ -21,8 +21,8 @@
  * \file TestParameters.h
  */
 
-#ifndef tests_storePerfTools_common_TestParameters_h_
-#define tests_storePerfTools_common_TestParameters_h_
+#ifndef tests_storePerftools_common_TestParameters_h_
+#define tests_storePerftools_common_TestParameters_h_
 
 #include "Parameters.h"
 
@@ -112,4 +112,4 @@ public:
 
 }}} // namespace tests::storePerftools::common
 
-#endif // tests_storePerfTools_common_TestParameters_h_
+#endif // tests_storePerftools_common_TestParameters_h_
diff --git a/cpp/src/tests/storePerfTools/common/TestResult.cpp b/cpp/src/tests/storePerftools/common/TestResult.cpp
index c3e9d27dfc..c3e9d27dfc 100644
--- a/cpp/src/tests/storePerfTools/common/TestResult.cpp
+++ b/cpp/src/tests/storePerftools/common/TestResult.cpp
diff --git a/cpp/src/tests/storePerfTools/common/TestResult.h b/cpp/src/tests/storePerftools/common/TestResult.h
index e2217286b4..e878164837 100644
--- a/cpp/src/tests/storePerfTools/common/TestResult.h
+++ b/cpp/src/tests/storePerftools/common/TestResult.h
@@ -21,8 +21,8 @@
  * \file TestResult.h
  */
 
-#ifndef tests_storePerfTools_common_TestResult_h_
-#define tests_storePerfTools_common_TestResult_h_
+#ifndef tests_storePerftools_common_TestResult_h_
+#define tests_storePerftools_common_TestResult_h_
 
 #include "ScopedTimable.h"
 #include "Streamable.h"
@@ -41,4 +41,4 @@ public:
 
 }}} // namespace tests:storePerftools::common
 
-#endif // tests_storePerfTools_common_TestResult_h_
+#endif // tests_storePerftools_common_TestResult_h_
diff --git a/cpp/src/tests/storePerfTools/common/Thread.cpp b/cpp/src/tests/storePerftools/common/Thread.cpp
index 188e102e8f..188e102e8f 100644
--- a/cpp/src/tests/storePerfTools/common/Thread.cpp
+++ b/cpp/src/tests/storePerftools/common/Thread.cpp
diff --git a/cpp/src/tests/storePerfTools/common/Thread.h b/cpp/src/tests/storePerftools/common/Thread.h
index 505d038162..bab484dd66 100644
--- a/cpp/src/tests/storePerfTools/common/Thread.h
+++ b/cpp/src/tests/storePerftools/common/Thread.h
@@ -21,8 +21,8 @@
  * \file Thread.h
  */
 
-#ifndef tests_storePerfTools_common_Thread_h_
-#define tests_storePerfTools_common_Thread_h_
+#ifndef tests_storePerftools_common_Thread_h_
+#define tests_storePerftools_common_Thread_h_
 
 #include <pthread.h>
 #include <string>
@@ -81,4 +81,4 @@ private:
 
 }}} // namespace tests::storePerftools::common
 
-#endif // tests_storePerfTools_common_Thread_h_
+#endif // tests_storePerftools_common_Thread_h_
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/Journal.cpp b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
index 6efdc06fc8..6efdc06fc8 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/Journal.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/Journal.cpp
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/Journal.h b/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
index 19d0980b53..acf1e43486 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/Journal.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/Journal.h
@@ -21,8 +21,8 @@
  * \file Journal.h
  */
 
-#ifndef tests_storePerfTools_jrnlPerf_Journal_h_
-#define tests_storePerfTools_jrnlPerf_Journal_h_
+#ifndef tests_storePerftools_jrnlPerf_Journal_h_
+#define tests_storePerftools_jrnlPerf_Journal_h_
 
 #ifdef JOURNAL2
 #   include "qpid/asyncStore/jrnl2/AioCallback.h"
@@ -166,4 +166,4 @@ protected:
 
 }}} // namespace tests::storePerftools::jrnlPerf
 
-#endif // tests_storePerfTools_jrnlPerf_Journal_h_
+#endif // tests_storePerftools_jrnlPerf_Journal_h_
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/JournalParameters.cpp b/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp
index 2b07619041..2b07619041 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/JournalParameters.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.cpp
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/JournalParameters.h b/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.h
index ab7f864a91..5367be9a4d 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/JournalParameters.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/JournalParameters.h
@@ -21,10 +21,10 @@
  * \file JournalParameters.h
  */
 
-#ifndef tests_storePerfTools_jrnlPerf_JournalParameters_h_
-#define tests_storePerfTools_jrnlPerf_JournalParameters_h_
+#ifndef tests_storePerftools_jrnlPerf_JournalParameters_h_
+#define tests_storePerftools_jrnlPerf_JournalParameters_h_
 
-#include "tests/storePerfTools/common/Parameters.h"
+#include "tests/storePerftools/common/Parameters.h"
 
 #ifdef JOURNAL2
 #   include "qpid/asyncStore/jrnl2/JournalParameters.h"
@@ -128,4 +128,4 @@ public:
 
 }}} // namespace tests::storePerftools::jrnlPerf
 
-#endif // tests_storePerfTools_jrnlPerf_JournalParameters_h_
+#endif // tests_storePerftools_jrnlPerf_JournalParameters_h_
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
index 17a9c9b6cb..9e322686ca 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.cpp
@@ -26,10 +26,10 @@
 #include "Journal.h"
 #include "JournalParameters.h"
 
-#include "tests/storePerfTools/version.h"
-#include "tests/storePerfTools/common/ScopedTimer.h"
-#include "tests/storePerfTools/common/TestParameters.h"
-#include "tests/storePerfTools/common/Thread.h"
+#include "tests/storePerftools/version.h"
+#include "tests/storePerftools/common/ScopedTimer.h"
+#include "tests/storePerftools/common/TestParameters.h"
+#include "tests/storePerftools/common/Thread.h"
 
 #ifdef JOURNAL2
 #   include "qpid/asyncStore/jrnl2/AsyncJournal.h"
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/PerfTest.h b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.h
index b105bc0488..d713cb837f 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/PerfTest.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/PerfTest.h
@@ -21,11 +21,11 @@
  * \file PerfTest.h
  */
 
-#ifndef tests_storePerfTools_jrnlPerf_PerfTest_h_
-#define tests_storePerfTools_jrnlPerf_PerfTest_h_
+#ifndef tests_storePerftools_jrnlPerf_PerfTest_h_
+#define tests_storePerftools_jrnlPerf_PerfTest_h_
 
 #include "TestResult.h"
-#include "tests/storePerfTools/common/Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 #include <vector>
 
@@ -132,4 +132,4 @@ bool readArgs(int argc,
 
 }}} // namespace tests::storePerftools::jrnlPerf
 
-#endif // tests_storePerfTools_jrnlPerf_PerfTest_h_
+#endif // tests_storePerftools_jrnlPerf_PerfTest_h_
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/TestResult.cpp b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp
index 9fe214726d..9fe214726d 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/TestResult.cpp
+++ b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.cpp
diff --git a/cpp/src/tests/storePerfTools/jrnlPerf/TestResult.h b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.h
index dae09a6032..620a7dcedd 100644
--- a/cpp/src/tests/storePerfTools/jrnlPerf/TestResult.h
+++ b/cpp/src/tests/storePerftools/jrnlPerf/TestResult.h
@@ -21,11 +21,11 @@
  * \file TestResult.h
  */
 
-#ifndef tests_storePerfTools_jrnlPerf_TestResult_h_
-#define tests_storePerfTools_jrnlPerf_TestResult_h_
+#ifndef tests_storePerftools_jrnlPerf_TestResult_h_
+#define tests_storePerftools_jrnlPerf_TestResult_h_
 
-#include "tests/storePerfTools/common/TestParameters.h"
-#include "tests/storePerfTools/common/TestResult.h"
+#include "tests/storePerftools/common/TestParameters.h"
+#include "tests/storePerftools/common/TestResult.h"
 
 namespace tests {
 namespace storePerftools {
@@ -89,4 +89,4 @@ protected:
 
 }}} // namespace tests::storePerftools::jrnlPerf
 
-#endif // tests_storePerfTools_jrnlPerf_TestResult_h_
+#endif // tests_storePerftools_jrnlPerf_TestResult_h_
diff --git a/cpp/src/tests/storePerfTools/version.h b/cpp/src/tests/storePerftools/version.h
index 311b145330..311b145330 100644
--- a/cpp/src/tests/storePerfTools/version.h
+++ b/cpp/src/tests/storePerftools/version.h