Changes to threading: queues serialiser removed, io threads used to drive dispatch to consumers

Fix to PersistableMessage: use correct lock when accessing synclist, don't hold enqueue lock when notifying queues



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

1 files changed, 61 insertions, 0 deletions

diff --git a/cpp/src/qpid/sys/AggregateOutput.cpp b/cpp/src/qpid/sys/AggregateOutput.cpp
new file mode 100644
index 0000000000..74eea5ed08
--- /dev/null
+++ b/cpp/src/qpid/sys/AggregateOutput.cpp
@@ -0,0 +1,61 @@
+/*
+ *
+ * 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/AggregateOutput.h"
+#include "qpid/log/Statement.h"
+
+namespace qpid {
+namespace sys {
+    
+void AggregateOutput::activateOutput()
+{
+    control.activateOutput();
+}
+
+bool AggregateOutput::doOutput()
+{
+    bool result = false;
+    if (!tasks.empty()) {
+        if (next >= tasks.size()) next = next % tasks.size();
+        
+        size_t start = next;
+        //loop until a task generated some output
+        while (!result) {
+            result = tasks[next++]->doOutput();
+            if (next >= tasks.size()) next = next % tasks.size();
+            if (start == next) break;
+        }
+    }
+    return result;
+}
+
+void AggregateOutput::addOutputTask(OutputTask* t)
+{
+    tasks.push_back(t);
+}
+     
+void AggregateOutput::removeOutputTask(OutputTask* t)
+{
+    TaskList::iterator i = find(tasks.begin(), tasks.end(), t);
+    if (i != tasks.end()) tasks.erase(i);
+}
+
+}} // namespace qpid::sys