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 <boost/cast.hpp> 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

1 files changed, 10 insertions, 10 deletions

diff --git a/cpp/lib/common/sys/ProducerConsumer.h b/cpp/lib/common/sys/ProducerConsumer.h
index 742639323b..c7f42f266d 100644
--- a/cpp/lib/common/sys/ProducerConsumer.h
+++ b/cpp/lib/common/sys/ProducerConsumer.h
@@ -30,7 +30,7 @@ namespace sys {
  * 
  * Producers increase the number of available items, consumers reduce it.
  * Consumers wait till an item is available. Waiting threads can be
- * woken for shutdown using stop().
+ * woken for shutdown using shutdown().
  *
  * Note: Currently implements unbounded producer-consumer, i.e. no limit
  * to available items, producers never block. Can be extended to support
@@ -43,16 +43,16 @@ class ProducerConsumer
   public:
     ProducerConsumer(size_t init_items=0);
 
-    ~ProducerConsumer() { stop(); }
+    ~ProducerConsumer() { shutdown(); }
 
     /**
      * Wake any threads waiting for ProducerLock or ConsumerLock.
      *@post No threads are waiting in Producer or Consumer locks.
      */
-    void stop();
+    void shutdown();
 
-    /** True if queue is stopped */
-    bool isStopped() { return stopped; }
+    /** True if queue is shutdown */
+    bool isShutdown() { return shutdownFlag; }
 
     /** Number of items available for consumers */
     size_t available() const;
@@ -76,7 +76,7 @@ class ProducerConsumer
          *confirm() or cancel() before the lock goes out of scope.
          *
          * false means the lock failed - timed out or the
-         * ProducerConsumer is stopped. You should not do anything in
+         * ProducerConsumer is shutdown. You should not do anything in
          * the scope of the lock.
          */
         bool isOk() const;
@@ -98,8 +98,8 @@ class ProducerConsumer
         /** True if this lock experienced a timeout */
         bool isTimedOut() const { return status == TIMEOUT; }
 
-        /** True if we have been stopped */
-        bool isStopped() const { return pc.isStopped(); }
+        /** True if we have been shutdown */
+        bool isShutdown() const { return pc.isShutdown(); }
         
         ProducerConsumer& pc;
 
@@ -141,7 +141,7 @@ class ProducerConsumer
          * Wait up to timeout to acquire lock.
          *@post If isOk() caller has a producer lock.
          * If isTimedOut() there was a timeout.
-         * If neither then we were stopped.
+         * If neither then we were shutdown.
          */
         ConsumerLock(ProducerConsumer& p, const Time& timeout);
 
@@ -153,7 +153,7 @@ class ProducerConsumer
     mutable Monitor monitor;
     size_t items;
     size_t waiters;
-    bool stopped;
+    bool shutdownFlag;
 
   friend class Lock;
   friend class ProducerLock;