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/client/BasicMessageChannel.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cpp/lib/client/BasicMessageChannel.h') diff --git a/cpp/lib/client/BasicMessageChannel.h b/cpp/lib/client/BasicMessageChannel.h index b921ec24d9..aaedfd6bf1 100644 --- a/cpp/lib/client/BasicMessageChannel.h +++ b/cpp/lib/client/BasicMessageChannel.h @@ -21,6 +21,7 @@ #include "MessageChannel.h" #include "IncomingMessage.h" +#include namespace qpid { namespace client { @@ -62,13 +63,13 @@ class BasicMessageChannel : public MessageChannel private: + class WaitableDestination; struct Consumer{ MessageListener* listener; AckMode ackMode; int count; u_int64_t lastDeliveryTag; }; - typedef std::map ConsumerMap; void deliver(Consumer& consumer, Message& msg); @@ -76,8 +77,11 @@ class BasicMessageChannel : public MessageChannel sys::Mutex lock; Channel& channel; IncomingMessage incoming; - ConsumerMap consumers; + uint64_t incoming_size; + ConsumerMap consumers ; ReturnedMessageHandler* returnsHandler; + boost::scoped_ptr destGet; + boost::scoped_ptr destDispatch; }; }} // namespace qpid::client -- cgit v1.2.1