From 729e9ce65125154cfdd2877abc8f7a901ad7caa2 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@apache.org>
Date: Tue, 3 Feb 2009 21:28:14 +0000
Subject: 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
---
 cpp/src/qpid/cluster/PollableQueue.h | 68 ++++++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 cpp/src/qpid/cluster/PollableQueue.h

(limited to 'cpp/src/qpid/cluster/PollableQueue.h')

diff --git a/cpp/src/qpid/cluster/PollableQueue.h b/cpp/src/qpid/cluster/PollableQueue.h
new file mode 100644
index 0000000000..e0422e2449
--- /dev/null
+++ b/cpp/src/qpid/cluster/PollableQueue.h
@@ -0,0 +1,68 @@
+#ifndef QPID_CLUSTER_POLLABLEQUEUE_H
+#define QPID_CLUSTER_POLLABLEQUEUE_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/sys/PollableQueue.h"
+#include  <qpid/log/Statement.h>
+
+namespace qpid {
+namespace cluster {
+
+/**
+ * More convenient version of PollableQueue that handles iterating
+ * over the batch and error handling.
+ */
+template <class T> class PollableQueue : public sys::PollableQueue<T> {
+  public:
+    typedef boost::function<void (const T&)> Callback;
+    typedef boost::function<void()> ErrorCallback;
+
+    PollableQueue(Callback f, ErrorCallback err, const std::string& msg, const boost::shared_ptr<sys::Poller>& poller)
+        : sys::PollableQueue<T>(boost::bind(&PollableQueue<T>::handleBatch, this, _1), poller),
+          callback(f), error(err), message(msg) {}
+
+    void handleBatch(typename sys::PollableQueue<T>::Queue& values) {
+        try {
+            typename sys::PollableQueue<T>::Queue::iterator i = values.begin();
+            while (i != values.end() && !this->isStopped()) {
+                callback(*i);
+                ++i;
+            }
+            values.erase(values.begin(), i);
+        }
+        catch (const std::exception& e) {
+            QPID_LOG(error, message << ": " << e.what());
+            error();
+        }
+    }
+
+  private:
+    Callback callback;
+    ErrorCallback error;
+    std::string message;
+};
+
+    
+}} // namespace qpid::cluster
+
+#endif  /*!QPID_CLUSTER_POLLABLEQUEUE_H*/
-- 
cgit v1.2.1