Attachment 646510 Details for Bug 874192 – Quick patch to prevent deadlock

[patch] Quick patch to prevent deadlock

bz874192.patch (text/plain), 1.49 KB, created by Jason Dillaman on 2012-11-16 18:24:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Dillaman

Created: 2012-11-16 18:24:01 UTC

Size: 1.49 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/sys/Timer.cpp b/qpid/cpp/src/qpid/sys/Timer.cpp
>index 83d1a52..76aa394 100644
>--- a/qpid/cpp/src/qpid/sys/Timer.cpp
>+++ b/qpid/cpp/src/qpid/sys/Timer.cpp
>@@ -56,6 +56,7 @@ bool TimerTask::prepareToFire() {
>     Monitor::ScopedLock l(stateMonitor);
>     if (state != CANCELLED) {
>         state = CALLING;
>+        callingThread = qpid::sys::Thread::current();
>         return true;
>     } else {
>         return false;
>@@ -68,6 +69,7 @@ void TimerTask::fireTask() {
> 
> void TimerTask::finishFiring() {
>     Monitor::ScopedLock l(stateMonitor);
>+    callingThread = qpid::sys::Thread();
>     if (state != CANCELLED) {
>         state = WAITING;
>         stateMonitor.notifyAll();
>@@ -90,8 +92,10 @@ void TimerTask::restart() {
> 
> void TimerTask::cancel() {
>     Monitor::ScopedLock l(stateMonitor);
>-    while (state == CALLING) {
>-        stateMonitor.wait();
>+    if ((state == CALLING) && (callingThread != qpid::sys::Thread::current())) {
>+        while (state == CALLING) {
>+            stateMonitor.wait();
>+        }
>     }
>     state = CANCELLED;
> }
>diff --git a/qpid/cpp/src/qpid/sys/Timer.h b/qpid/cpp/src/qpid/sys/Timer.h
>index 5731b8d..1b2d9c5 100644
>--- a/qpid/cpp/src/qpid/sys/Timer.h
>+++ b/qpid/cpp/src/qpid/sys/Timer.h
>@@ -49,6 +49,7 @@ class TimerTask : public RefCounted {
>     Duration period;
>     AbsTime nextFireTime;
>     qpid::sys::Monitor stateMonitor;
>+    qpid::sys::Thread callingThread;
>     enum {WAITING, CALLING, CANCELLED} state;
> 
>     bool prepareToFire();
>

Actions: View | Diff

Attachments on bug 874192: 640226 | 646451 | 646510 | 648218