You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2012/07/16 19:30:00 UTC
svn commit: r1362153 -
/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/
Author: kpvdr
Date: Mon Jul 16 17:30:00 2012
New Revision: 1362153
URL: http://svn.apache.org/viewvc?rev=1362153&view=rev
Log:
QPID-3858: WIP - More tidy-up
Modified:
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.h
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.cpp
qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.h
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.cpp Mon Jul 16 17:30:00 2012
@@ -24,6 +24,7 @@
#include "DeliveryRecord.h"
#include "MessageConsumer.h"
+#include "QueuedMessage.h"
#include "SimpleMessage.h"
#include "SimpleQueue.h"
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/DeliveryRecord.h Mon Jul 16 17:30:00 2012
@@ -24,7 +24,7 @@
#ifndef tests_storePerftools_asyncPerf_DeliveryRecord_h_
#define tests_storePerftools_asyncPerf_DeliveryRecord_h_
-#include "QueuedMessage.h"
+//#include "QueuedMessage.h"
#include <boost/shared_ptr.hpp>
@@ -38,6 +38,7 @@ namespace storePerftools {
namespace asyncPerf {
class MessageConsumer;
+class QueuedMessage;
class DeliveryRecord {
public:
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.cpp Mon Jul 16 17:30:00 2012
@@ -22,6 +22,7 @@
*/
#include "MessageAsyncContext.h"
+
#include "SimpleMessage.h"
#include <cassert>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageAsyncContext.h Mon Jul 16 17:30:00 2012
@@ -25,7 +25,6 @@
#define tests_storePerfTools_asyncPerf_MessageContext_h_
#include "qpid/asyncStore/AsyncOperation.h"
-#include "qpid/broker/AsyncStore.h" // qpid::broker::BrokerAsyncContext
#include <boost/intrusive_ptr.hpp>
#include <boost/shared_ptr.hpp>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/MessageDeque.cpp Mon Jul 16 17:30:00 2012
@@ -22,6 +22,7 @@
*/
#include "MessageDeque.h"
+
#include "QueuedMessage.h"
namespace tests {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp Mon Jul 16 17:30:00 2012
@@ -34,8 +34,6 @@
#include "qpid/Modules.h" // Use with loading store as module
#include "qpid/asyncStore/AsyncStoreImpl.h"
#include "qpid/asyncStore/AsyncStoreOptions.h"
-#include "qpid/broker/AsyncStore.h"
-#include "qpid/sys/Poller.h"
#include <iomanip>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h Mon Jul 16 17:30:00 2012
@@ -36,9 +36,6 @@
#include <deque>
namespace qpid {
-namespace broker {
-class AsyncStore;
-}
namespace asyncStore {
class AsyncStoreImpl;
class AsyncStoreOptions;
@@ -63,6 +60,8 @@ public:
const qpid::asyncStore::AsyncStoreOptions& aso);
virtual ~PerfTest();
void run();
+
+ // --- Interface tests::storePerftools::common::Streamable ---
void toStream(std::ostream& os = std::cout) const;
private:
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.cpp Mon Jul 16 17:30:00 2012
@@ -22,6 +22,7 @@
*/
#include "QueueAsyncContext.h"
+
#include "SimpleMessage.h"
#include <cassert>
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueueAsyncContext.h Mon Jul 16 17:30:00 2012
@@ -25,6 +25,7 @@
#define tests_storePerftools_asyncPerf_QueueContext_h_
#include "qpid/asyncStore/AsyncOperation.h"
+#include "qpid/broker/AsyncResultHandle.h"
#include "qpid/broker/AsyncStore.h"
#include "qpid/broker/TxnHandle.h"
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/QueuedMessage.h Mon Jul 16 17:30:00 2012
@@ -55,7 +55,7 @@ public:
SimpleQueue* getQueue() const;
boost::intrusive_ptr<SimpleMessage> payload() const;
- // -- Transaction handling ---
+ // --- Transaction handling ---
void prepareEnqueue(qpid::broker::TxnHandle& th);
void commitEnqueue();
void abortEnqueue();
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.cpp Mon Jul 16 17:30:00 2012
@@ -23,7 +23,7 @@
#include "SimpleMessage.h"
-#include "qpid/asyncStore/AsyncStoreImpl.h"
+#include <string.h> // memcpy()
namespace tests {
namespace storePerftools {
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleMessage.h Mon Jul 16 17:30:00 2012
@@ -32,8 +32,6 @@ namespace tests {
namespace storePerftools {
namespace asyncPerf {
-class SimpleQueue;
-
class SimpleMessage: public qpid::broker::PersistableMessage,
public qpid::broker::DataSource
{
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.cpp Mon Jul 16 17:30:00 2012
@@ -28,13 +28,13 @@
#include "MessageDeque.h"
#include "PersistableQueuedMessage.h"
#include "QueueAsyncContext.h"
-#include "QueuedMessage.h"
#include "SimpleMessage.h"
-#include "qpid/asyncStore/AsyncStoreImpl.h"
#include "qpid/broker/AsyncResultHandle.h"
+#include "qpid/broker/TxnHandle.h"
#include <boost/make_shared.hpp>
+#include <string.h> // memcpy()
namespace tests {
namespace storePerftools {
@@ -80,7 +80,6 @@ SimpleQueue::handleAsyncResult(const qpi
std::cerr << "Queue name=\"" << qc->getQueue()->m_name << "\": Operation " << qc->getOpStr() << ": failure "
<< arh->getErrNo() << " (" << arh->getErrMsg() << ")" << std::endl;
} else {
-//std::cout << "QQQ SimpleQueue::handleAsyncResult() op=" << qc->getOpStr() << std::endl << std::flush;
// Handle async success here
switch(qc->getOpCode()) {
case qpid::asyncStore::AsyncOperation::QUEUE_CREATE:
@@ -169,11 +168,7 @@ SimpleQueue::deliver(boost::intrusive_pt
} else {
qm = boost::make_shared<QueuedMessage>(new QueuedMessage(this, msg));
}
-//boost::shared_ptr<PersistableQueuedMessage> pqm1 = boost::dynamic_pointer_cast<PersistableQueuedMessage>(qm);
-//assert(pqm1.get());
enqueue(s_nullTxnHandle, qm);
-//boost::shared_ptr<PersistableQueuedMessage> pqm2 = boost::dynamic_pointer_cast<PersistableQueuedMessage>(qm);
-//assert(pqm2.get());
push(qm);
}
@@ -226,10 +221,6 @@ SimpleQueue::dequeue(qpid::broker::TxnHa
}
if (qm->payload()->isPersistent() && m_store) {
qm->payload()->dequeueAsync(shared_from_this(), m_store);
-//assert(qm.get());
-//boost::shared_ptr<PersistableQueuedMessage> pqm = boost::dynamic_pointer_cast<PersistableQueuedMessage>(qm);
-//assert(pqm.get());
-//return asyncDequeue(th, pqm);
return asyncDequeue(th, boost::dynamic_pointer_cast<PersistableQueuedMessage>(qm));
}
return true;
@@ -381,7 +372,6 @@ SimpleQueue::asyncEnqueue(qpid::broker::
{
assert(pqm.get());
// qm.payload()->setPersistenceId(m_store->getNextRid()); // TODO: rid is set by store itself - find way to do this
-//std::cout << "QQQ Queue=\"" << m_name << "\": asyncEnqueue() rid=0x" << std::hex << pqm->payload()->getPersistenceId() << std::dec << std::endl << std::flush;
boost::shared_ptr<QueueAsyncContext> qac(new QueueAsyncContext(shared_from_this(),
pqm->payload(),
th,
@@ -405,7 +395,6 @@ SimpleQueue::asyncDequeue(qpid::broker::
boost::shared_ptr<PersistableQueuedMessage> pqm)
{
assert(pqm.get());
-//std::cout << "QQQ Queue=\"" << m_name << "\": asyncDequeue() rid=0x" << std::hex << qm.payload()->getPersistenceId() << std::dec << std::endl << std::flush;
boost::shared_ptr<QueueAsyncContext> qac(new QueueAsyncContext(shared_from_this(),
pqm->payload(),
th,
@@ -438,7 +427,6 @@ SimpleQueue::destroyCheck(const std::str
void
SimpleQueue::createComplete(const boost::shared_ptr<QueueAsyncContext> qc)
{
-//std::cout << "QQQ Queue name=\"" << qc->getQueue()->getName() << "\": createComplete()" << std::endl << std::flush;
assert(qc->getQueue().get() == this);
--m_asyncOpCounter;
}
@@ -447,7 +435,6 @@ SimpleQueue::createComplete(const boost:
void
SimpleQueue::flushComplete(const boost::shared_ptr<QueueAsyncContext> qc)
{
-//std::cout << "QQQ Queue name=\"" << qc->getQueue()->getName() << "\": flushComplete()" << std::endl << std::flush;
assert(qc->getQueue().get() == this);
--m_asyncOpCounter;
}
@@ -456,7 +443,6 @@ SimpleQueue::flushComplete(const boost::
void
SimpleQueue::destroyComplete(const boost::shared_ptr<QueueAsyncContext> qc)
{
-//std::cout << "QQQ Queue name=\"" << qc->getQueue()->getName() << "\": destroyComplete()" << std::endl << std::flush;
assert(qc->getQueue().get() == this);
--m_asyncOpCounter;
m_destroyed = true;
@@ -466,7 +452,6 @@ SimpleQueue::destroyComplete(const boost
void
SimpleQueue::enqueueComplete(const boost::shared_ptr<QueueAsyncContext> qc)
{
-//std::cout << "QQQ Queue name=\"" << qc->getQueue()->getName() << "\": enqueueComplete() rid=0x" << std::hex << qc->getMessage()->getPersistenceId() << std::dec << std::endl << std::flush;
assert(qc->getQueue().get() == this);
--m_asyncOpCounter;
@@ -482,7 +467,6 @@ SimpleQueue::enqueueComplete(const boost
void
SimpleQueue::dequeueComplete(const boost::shared_ptr<QueueAsyncContext> qc)
{
-//std::cout << "QQQ Queue name=\"" << qc->getQueue()->getName() << "\": dequeueComplete() rid=0x" << std::hex << qc->getMessage()->getPersistenceId() << std::dec << std::endl << std::flush;
assert(qc->getQueue().get() == this);
--m_asyncOpCounter;
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/SimpleQueue.h Mon Jul 16 17:30:00 2012
@@ -36,7 +36,7 @@
namespace qpid {
namespace asyncStore {
-class AsyncStoreImpl;
+//class AsyncStoreImpl;
}
namespace broker {
class AsyncResultQueue;
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.cpp?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.cpp (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.cpp Mon Jul 16 17:30:00 2012
@@ -26,7 +26,7 @@
#include "PersistableQueuedMessage.h"
#include "QueuedMessage.h"
#include "SimpleMessage.h"
-#include "SimpleQueue.h" // debug msg
+#include "SimpleQueue.h"
#include "qpid/log/Statement.h"
Modified: qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.h
URL: http://svn.apache.org/viewvc/qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.h?rev=1362153&r1=1362152&r2=1362153&view=diff
==============================================================================
--- qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.h (original)
+++ qpid/branches/asyncstore/cpp/src/tests/storePerftools/asyncPerf/TxnPublish.h Mon Jul 16 17:30:00 2012
@@ -32,11 +32,6 @@
#include <boost/shared_ptr.hpp>
#include <list>
-namespace qpid {
-namespace broker {
-class TransactionContext;
-}}
-
namespace tests {
namespace storePerftools {
namespace asyncPerf {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org