Attachment 641055 Details for Bug 872696 – Quick patch to prevent duplicate output tasks

[patch] Quick patch to prevent duplicate output tasks

bz872696.patch (text/plain), 1.81 KB, created by Jason Dillaman on 2012-11-08 19:47:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Dillaman

Created: 2012-11-08 19:47:04 UTC

Size: 1.81 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/sys/AggregateOutput.cpp b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
>index fc95f46..2133634 100644
>--- a/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
>+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.cpp
>@@ -61,6 +61,8 @@ bool AggregateOutput::doOutput() {
>         if (didOutput) {
>             tasks.push_back(t);
>             return true;
>+        } else {
>+            taskSet.erase(t);
>         }
>     }
>     return false;
>@@ -68,19 +70,24 @@ bool AggregateOutput::doOutput() {
>   
> void AggregateOutput::addOutputTask(OutputTask* task) {
>     Mutex::ScopedLock l(lock);
>-    tasks.push_back(task);
>+    if (taskSet.insert(task).second) {
>+        tasks.push_back(task);
>+    }
> }
> 
> void AggregateOutput::removeOutputTask(OutputTask* task) {
>     Mutex::ScopedLock l(lock);
>     while (busy) lock.wait();
>-    tasks.erase(std::remove(tasks.begin(), tasks.end(), task), tasks.end());
>+    if (taskSet.erase(task) > 0) {
>+        tasks.erase(std::remove(tasks.begin(), tasks.end(), task), tasks.end());
>+    }
> }
>   
> void AggregateOutput::removeAll()
> {
>     Mutex::ScopedLock l(lock);
>     while (busy) lock.wait();
>+    taskSet.clear();
>     tasks.clear();
> }
>   
>diff --git a/qpid/cpp/src/qpid/sys/AggregateOutput.h b/qpid/cpp/src/qpid/sys/AggregateOutput.h
>index d7c0ff2..802722a 100644
>--- a/qpid/cpp/src/qpid/sys/AggregateOutput.h
>+++ b/qpid/cpp/src/qpid/sys/AggregateOutput.h
>@@ -28,6 +28,7 @@
> 
> #include <algorithm>
> #include <deque>
>+#include <set>
> 
> namespace qpid {
> namespace sys {
>@@ -44,9 +45,11 @@ namespace sys {
> class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask, public OutputControl
> {
>     typedef std::deque<OutputTask*> TaskList;
>+    typedef std::set<OutputTask*> TaskSet;
> 
>     Monitor lock;
>     TaskList tasks;
>+    TaskSet taskSet;
>     bool busy;
>     OutputControl& control;
> 
>

Actions: View | Diff

Attachments on bug 872696: 641055 | 641080