From 32f04433aebc19c9dcc89f3f5a3cf313b8100672 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 5 Feb 2008 20:44:14 +0000 Subject: Added testSendToSelf for https://bugzilla.redhat.com/show_bug.cgi?id=410551 M src/tests/ClientSessionTest.cpp Disabled management for BrokerFixture - management singleton assumes only one broker per process, causes shutdown races with fixtures. M src/tests/BrokerFixture.h Made Timer::stop() idempotent M src/qpid/broker/Timer.cpp M src/qpid/broker/Timer.h Added STL-style size() and empty() M src/qpid/sys/BlockingQueue.h M src/qpid/client/LocalQueue.cpp M src/qpid/client/LocalQueue.h git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@618770 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/sys/BlockingQueue.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cpp/src/qpid/sys') diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/cpp/src/qpid/sys/BlockingQueue.h index 56d41574df..dd709c6bff 100644 --- a/cpp/src/qpid/sys/BlockingQueue.h +++ b/cpp/src/qpid/sys/BlockingQueue.h @@ -103,10 +103,14 @@ public: return closed; } - bool isEmpty() const { + bool empty() const { Waitable::ScopedLock l(lock); return queue.empty(); } + size_t size() const { + Waitable::ScopedLock l(lock); + return queue.size(); + } private: -- cgit v1.2.1