Changeset 14567 for trunk/FACT++

Timestamp:

11/06/12 00:23:11 (12 years ago)

Author:

tbretz

Message:

Fixed a problem with the mutics. If an event is unsubscribed, it can call the infoHandler to signal that it is disconnected, which would call HasEvent, which uses the samemutex than Unsubscribe

File:

• trunk/FACT++/src/StateMachineImp.cc (modified) (6 diffs)

trunk/FACT++/src/StateMachineImp.cc

@@ -177 +177 @@
 void StateMachineImp::PushEvent(Event *cmd)
 {
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
     fEventQueue.push(cmd);
-    fMutex.unlock();
 }
 
@@ -193 +192 @@
 Event *StateMachineImp::PopEvent()
 {
-    fMutex.lock();
+    const lock_guard<mutex> guard(fMutex);
 
     // Get the next event from the stack
@@ -199 +198 @@
     Event *cmd = fEventQueue.front();
     fEventQueue.pop();
-
-    fMutex.unlock();
 
     return cmd;
@@ -554 +551 @@
 #endif
 
-    fMutexEvt.lock();
+    const lock_guard<mutex> guard(fMutexEvt);
     fListOfEvents.push_back(evt);
-    fMutexEvt.unlock();
-
     return *evt;
 }
@@ -622 +617 @@
     EventImp *evt = CreateService(name);
 
-    fMutexEvt.lock();
+    const lock_guard<mutex> guard(fMutexEvt);
     fListOfEvents.push_back(evt);
-    fMutexEvt.unlock();
-
     return *evt;
 }
@@ -631 +624 @@
 void StateMachineImp::Unsubscribe(EventImp *evt)
 {
-    const lock_guard<mutex> guard(fMutexEvt);
-
-    auto it = find(fListOfEvents.begin(), fListOfEvents.end(), evt);
-    if (it==fListOfEvents.end())
+    {
+        const lock_guard<mutex> guard(fMutexEvt);
+
+        auto it = find(fListOfEvents.begin(), fListOfEvents.end(), evt);
+        if (it==fListOfEvents.end())
         return;
 
-    fListOfEvents.erase(it);
+        fListOfEvents.erase(it);
+    }
     delete evt;
 }