From 847ee577e23fbdd2175709a08a7160e8b2c1f464 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 27 Mar 2007 15:36:39 +0000 Subject: Refactored client::Message to be independent of all Basic class concepts and client::IncomingMessage to handle 0-9 style references and appends. * cpp/lib/client/ClientMessage.cpp: Made independent of Basic class. * cpp/lib/client/IncomingMessage.cpp: Refactored to handle references/appends. * cpp/lib/client/BasicMessageChannel.cpp: Refactored to use new IncomingMessage Thread safety fixes: * cpp/lib/client/ResponseHandler.h: Remove stateful functions. * cpp/lib/client/ClientChannel.cpp: use new ResponseHandler interface. Minor cleanup: * cpp/lib/common/framing/BasicHeaderProperties.cpp: use DeliveryMode enum. * cpp/tests/HeaderTest.cpp: use DeliveryMode enum. * cpp/tests/MessageTest.cpp: use DeliveryMode enum. * cpp/lib/common/shared_ptr.h: #include for convenience. * cpp/lib/common/sys/ThreadSafeQueue.h: Changed "stop" "shutdown" * cpp/lib/common/sys/ProducerConsumer.h: Changed "stop" "shutdown" * cpp/tests/ClientChannelTest.cpp (TestCase): Removed debug couts. * cpp/tests/setup: valgrind --demangle=yes by default. * cpp/tests/topictest: sleep to hack around startup race. * cpp/lib/broker/BrokerQueue.cpp (configure): Fixed memory leak. Removed/updated FIXME comments in: * cpp/lib/broker/BrokerMessage.cpp: * cpp/lib/broker/BrokerMessageBase.h: * cpp/lib/broker/InMemoryContent.cpp: * cpp/lib/common/framing/MethodContext.h: git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@522956 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/lib/common/sys/ThreadSafeQueue.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/lib/common/sys/ThreadSafeQueue.h') diff --git a/cpp/lib/common/sys/ThreadSafeQueue.h b/cpp/lib/common/sys/ThreadSafeQueue.h index ff949a3e16..80ea92da0e 100644 --- a/cpp/lib/common/sys/ThreadSafeQueue.h +++ b/cpp/lib/common/sys/ThreadSafeQueue.h @@ -46,7 +46,7 @@ class ThreadSafeQueue } /** Pop a value from the front of the queue. Waits till value is available. - *@throw ShutdownException if queue is stopped while waiting. + *@throw ShutdownException if queue is shutdown while waiting. */ T pop() { ProducerConsumer::ConsumerLock consumer(pc); @@ -75,10 +75,10 @@ class ThreadSafeQueue } /** Interrupt threads waiting in pop() */ - void stop() { pc.stop(); } + void shutdown() { pc.shutdown(); } - /** True if queue is stopped */ - bool isStopped() { return pc.isStopped(); } + /** True if queue is shutdown */ + bool isShutdown() { return pc.isShutdown(); } /** Size of the queue */ size_t size() { ProducerConsumer::Lock l(pc); return container.size(); } -- cgit v1.2.1