From a93fd0ded317dacd869d740d3312aad1c43717d7 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Wed, 14 Nov 2007 09:34:51 +0000 Subject: Fixed locking (lock was not being released for invocation on callback due to being locked twice but unlocked only once) git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@594812 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qpid/sys/Serializer.cpp | 15 ++++++++++++--- qpid/cpp/src/qpid/sys/Serializer.h | 2 ++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/qpid/sys/Serializer.cpp b/qpid/cpp/src/qpid/sys/Serializer.cpp index f02e51ddb4..a82982a0c8 100644 --- a/qpid/cpp/src/qpid/sys/Serializer.cpp +++ b/qpid/cpp/src/qpid/sys/Serializer.cpp @@ -51,11 +51,20 @@ void SerializerBase::notifyWorker() { lock.notify(); } -void SerializerBase::run() { +bool SerializerBase::running() { + Mutex::ScopedLock l(lock); + return state != SHUTDOWN; +} + +void SerializerBase::wait() { Mutex::ScopedLock l(lock); - while (state != SHUTDOWN) { + lock.wait(); +} + +void SerializerBase::run() { + while (running()) { dispatch(); - lock.wait(); + wait(); } } diff --git a/qpid/cpp/src/qpid/sys/Serializer.h b/qpid/cpp/src/qpid/sys/Serializer.h index 30b7f88505..fe4afc85cb 100644 --- a/qpid/cpp/src/qpid/sys/Serializer.h +++ b/qpid/cpp/src/qpid/sys/Serializer.h @@ -61,6 +61,8 @@ class SerializerBase : private boost::noncopyable, private Runnable void notifyWorker(); void run(); virtual bool empty() = 0; + bool running(); + void wait(); Monitor lock; State state; -- cgit v1.2.1