* cpp/lib/client/ClientMessage.h/.cpp: Added Message constructor taking data.

* cpp/lib/client/IncomingMessage.cpp: Simplified message aggregation.
* cpp/lib/common/framing/AMQ*Body.h: remove unnecessary virtual inheritance.
* cpp/lib/common/framing/AMQMethodBody.h: add bool isRequest, isResponse
* cpp/lib/common/sys/Mutex.h (class ScopedUnlock): Added ScopedUnlock
* cpp/lib/common/sys/ThreadSafeQueue.h: Thread-safe queue template.
* cpp/tests/BrokerChannelTest.cpp: Renamed from ChannelTest.
* cpp/tests/ClientChannelTest.cpp: Test client API.
* cpp/tests/RequestResponseTest.cpp: Removed empty test.
* cpp/lib/client/Connection.h,.cpp:
 - non-static channelIdCounter
 - No close() in dtor.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@508705 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 119 insertions, 3 deletions

diff --git a/cpp/lib/common/ExceptionHolder.h b/cpp/lib/common/ExceptionHolder.h
index 83d0884be9..1e5a30e27c 100644
--- a/cpp/lib/common/ExceptionHolder.h
+++ b/cpp/lib/common/ExceptionHolder.h
@@ -53,6 +53,7 @@ class ExceptionHolder : public Exception, public boost::shared_ptr<Exception>
     std::string toString() const throw() { return (*this)->toString(); }
     virtual Exception* clone() const throw() { return (*this)->clone(); }
     virtual void throwSelf() const { (*this)->throwSelf(); }
+    virtual void throwIf() const { if (*this) (*this)->throwSelf(); }
 };
 
 } // namespace qpid
diff --git a/cpp/lib/common/framing/AMQContentBody.h b/cpp/lib/common/framing/AMQContentBody.h
index 172228671a..a324f1ab21 100644
--- a/cpp/lib/common/framing/AMQContentBody.h
+++ b/cpp/lib/common/framing/AMQContentBody.h
@@ -28,7 +28,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQContentBody : virtual public AMQBody
+class AMQContentBody : public AMQBody
 {
     string data;
 
diff --git a/cpp/lib/common/framing/AMQHeaderBody.h b/cpp/lib/common/framing/AMQHeaderBody.h
index 31cf7d575e..77f56d9a93 100644
--- a/cpp/lib/common/framing/AMQHeaderBody.h
+++ b/cpp/lib/common/framing/AMQHeaderBody.h
@@ -29,7 +29,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQHeaderBody : virtual public AMQBody
+class AMQHeaderBody :  public AMQBody
 {
     HeaderProperties* properties;
     u_int16_t weight;
diff --git a/cpp/lib/common/framing/AMQHeartbeatBody.h b/cpp/lib/common/framing/AMQHeartbeatBody.h
index a2315119e4..20a954c468 100644
--- a/cpp/lib/common/framing/AMQHeartbeatBody.h
+++ b/cpp/lib/common/framing/AMQHeartbeatBody.h
@@ -28,7 +28,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQHeartbeatBody : virtual public AMQBody
+class AMQHeartbeatBody :  public AMQBody
 {
 public:
     typedef boost::shared_ptr<AMQHeartbeatBody> shared_ptr;
diff --git a/cpp/lib/common/framing/AMQMethodBody.h b/cpp/lib/common/framing/AMQMethodBody.h
index 492571c83c..9b39a3d721 100644
--- a/cpp/lib/common/framing/AMQMethodBody.h
+++ b/cpp/lib/common/framing/AMQMethodBody.h
@@ -60,6 +60,9 @@ class AMQMethodBody : public AMQBody
     /** Return request ID or response correlationID */
     virtual RequestId getRequestId() const { return 0; }
 
+    virtual bool isRequest() const { return false; }
+    virtual bool isResponse() const { return false; }
+
   protected:
     static u_int32_t baseSize() { return 4; }
 
diff --git a/cpp/lib/common/framing/AMQRequestBody.h b/cpp/lib/common/framing/AMQRequestBody.h
index 9b8fc1d663..d9eb78c26f 100644
--- a/cpp/lib/common/framing/AMQRequestBody.h
+++ b/cpp/lib/common/framing/AMQRequestBody.h
@@ -62,6 +62,7 @@ class AMQRequestBody : public AMQMethodBody
     void setRequestId(RequestId id) { data.requestId=id; }
     void setResponseMark(ResponseId mark) { data.responseMark=mark; }
 
+    bool isRequest()const { return true; }
   protected:
     static const u_int32_t baseSize() { return AMQMethodBody::baseSize()+20; }
     void printPrefix(std::ostream& out) const;
diff --git a/cpp/lib/common/framing/AMQResponseBody.h b/cpp/lib/common/framing/AMQResponseBody.h
index 3954836ec8..5ed76ff67d 100644
--- a/cpp/lib/common/framing/AMQResponseBody.h
+++ b/cpp/lib/common/framing/AMQResponseBody.h
@@ -69,6 +69,7 @@ class AMQResponseBody : public AMQMethodBody
     void setRequestId(RequestId id) { data.requestId = id; }
     void setBatchOffset(BatchOffset id) { data.batchOffset = id; }
 
+    bool isResponse() const { return true; }
   protected:
     static const u_int32_t baseSize() { return AMQMethodBody::baseSize()+20; }
     void printPrefix(std::ostream& out) const;
diff --git a/cpp/lib/common/sys/Mutex.h b/cpp/lib/common/sys/Mutex.h
index 4022da2f6e..87d537fb9e 100644
--- a/cpp/lib/common/sys/Mutex.h
+++ b/cpp/lib/common/sys/Mutex.h
@@ -46,12 +46,23 @@ class ScopedLock
     L& mutex;
 };
 
+template <class L>
+class ScopedUnlock
+{
+  public:
+    ScopedUnlock(L& l) : mutex(l) { l.unlock(); }
+    ~ScopedUnlock() { mutex.lock(); }
+  private:
+    L& mutex;
+};
+    
 /**
  * Mutex lock.
  */
 class Mutex : private boost::noncopyable {
   public:
     typedef ScopedLock<Mutex> ScopedLock;
+    typedef ScopedUnlock<Mutex> ScopedUnlock;
     
     inline Mutex();
     inline ~Mutex();
diff --git a/cpp/lib/common/sys/ThreadSafeQueue.h b/cpp/lib/common/sys/ThreadSafeQueue.h
new file mode 100644
index 0000000000..89454d693f
--- /dev/null
+++ b/cpp/lib/common/sys/ThreadSafeQueue.h
@@ -0,0 +1,99 @@
+#ifndef _sys_ThreadSafeQueue_h
+#define _sys_ThreadSafeQueue_h
+
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include <deque>
+#include "ProducerConsumer.h"
+#include "Exception.h"
+
+namespace qpid {
+namespace sys {
+
+/**
+ * A thread safe queue template.
+ */
+template <class T, class ContainerType=std::deque<T> >
+class ThreadSafeQueue
+{
+  public:
+    struct QueueStoppedException : public Exception {};
+
+    ThreadSafeQueue() {}
+
+    /** Push a value onto the back of the queue */
+    void push(const T& value) {
+        ProducerConsumer::ProducerLock producer(pc);
+        if (producer.isOk()) {
+            producer.confirm();
+            container.push_back(value);
+        }
+    }
+
+    /** Pop a value from the front of the queue. Waits till value is available.
+     *@throw QueueStoppedException if queue is stopped while waiting.
+     */
+    T pop() {
+        ProducerConsumer::ConsumerLock consumer(pc);
+        if (consumer.isOk()) {
+            consumer.confirm();
+            T value(container.front());
+            container.pop_front();
+            return value;
+        }
+        throw QueueStoppedException();
+    }
+
+    /**
+     * If a value becomes available within the timeout, set outValue
+     * and return true. Otherwise return false;
+     */
+    bool pop(T& outValue, const Time& timeout) {
+        ProducerConsumer::ConsumerLock consumer(pc, timeout);
+        if (consumer.isOk()) {
+            consumer.confirm();
+            outValue = container.front();
+            container.pop_front();
+            return true;
+        }
+        return false;
+    }
+
+    /** Interrupt threads waiting in pop() */
+    void stop() { pc.stop(); }
+
+    /** True if queue is stopped */
+    bool isStopped() { return pc.isStopped(); }
+
+    /** Size of the queue */
+    size_t size() { ProducerConsumer::Lock l(pc); return container.size(); }
+
+    /** True if queue is empty */
+    bool empty() { ProducerConsumer::Lock l(pc); return container.empty(); }
+
+  private:
+    ProducerConsumer pc;
+    ContainerType container;
+};
+
+}} // namespace qpid::sys
+
+
+
+#endif  /*!_sys_ThreadSafeQueue_h*/