Fix for race conditions in cluster join.

 - ConnectionDecoder: separated from Connection. 
 - cluster/PollableQueue: stop processing frames if PollableQueue is stopped.
 - move state checks in event-queue handler to frame-queue handler.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@740459 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 60 insertions, 0 deletions

diff --git a/cpp/src/qpid/cluster/ConnectionDecoder.h b/cpp/src/qpid/cluster/ConnectionDecoder.h
new file mode 100644
index 0000000000..5f139b23e9
--- /dev/null
+++ b/cpp/src/qpid/cluster/ConnectionDecoder.h
@@ -0,0 +1,60 @@
+#ifndef QPID_CLUSTER_CONNECTIONDECODER_H
+#define QPID_CLUSTER_CONNECTIONDECODER_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 "qpid/framing/FrameDecoder.h"
+#include <boost/function.hpp>
+
+namespace qpid {
+namespace cluster {
+
+class EventHeader;
+class EventFrame;
+/**
+ * Decodes delivered connection data Event's as EventFrame's for a
+ * connection replica, local or shadow. Manages state for frame
+ * fragments and flow control.
+ * 
+ * THREAD UNSAFE: connection events are decoded in sequence.
+ */
+class ConnectionDecoder
+{
+  public:
+    typedef boost::function<void(const EventFrame&)> Handler;
+
+    ConnectionDecoder(const Handler& h);
+
+    /** Takes EventHeader + data rather than Event so that the caller can
+     * pass a pointer to connection data or a CPG buffer directly without copy.
+     */
+    void decode(const EventHeader& eh, const void* data);
+
+  private:
+    Handler handler;
+    framing::FrameDecoder decoder;
+    int readCredit;
+};
+
+}} // namespace qpid::cluster
+
+#endif  /*!QPID_CLUSTER_CONNECTIONDECODER_H*/