From f61e1ef7589da893b9b54448224dc0961515eb40 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Fri, 26 Oct 2007 19:48:31 +0000 Subject: Session resume support in client & broker: Client can resume a session after voluntary suspend() or network failure. Frames lost in network failure are automatically re-transmitted for transparent re-connection. client::Session improvements: - Locking to avoid races between network & user threads. - Replaced client::StateManager with sys::StateMonitor - avoid heap allocation. qpid::Exception clean up: - use QPID_MSG consistently to format exception messages. - throw typed exceptions (in reply_exceptions.h) for AMQP exceptions. - re-throw correct typed exception on client for exceptions from broker. - Removed QpidError.h rubygen/templates/constants.rb: - constants.h: Added FOO_CLASS_ID and FOO_BAR_METHOD_ID constants. - reply_constants.h: Added throwReplyException(code, text) log::Logger: - Fixed shutdown race in Statement::~Initializer() git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@588761 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/tests/ConcurrentQueue.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/tests/ConcurrentQueue.cpp') diff --git a/cpp/src/tests/ConcurrentQueue.cpp b/cpp/src/tests/ConcurrentQueue.cpp index e1adcce0f9..39155b4ff2 100644 --- a/cpp/src/tests/ConcurrentQueue.cpp +++ b/cpp/src/tests/ConcurrentQueue.cpp @@ -61,7 +61,7 @@ template class DualVectorDualLockQueue { /** If the queue is non-empty, pop the front item into data and * return true. If the queue is empty, return false */ - bool pop(T& data) { + bool tryPop(T& data) { Mutex::ScopedLock l(popLock); if (popIter == popVec.end()) { popVec.clear(); @@ -109,7 +109,7 @@ void nspin(const Duration& delay) { struct NullQueue { NullQueue(int items=0) : npush(items), npop(items) {} void push(int) { --npush; } - bool pop(int& n) { + bool tryPop(int& n) { if (npop == 0) return false; else { @@ -144,7 +144,7 @@ struct Popper : public Runnable { void run() { for (int i=items; i > 0; i--) { int n; - if (queue.pop(n)) + if (queue.tryPop(n)) BOOST_REQUIRE_EQUAL(i,n); npause(); } -- cgit v1.2.1