Changeset 14124 for trunk

Timestamp:

06/08/12 17:09:54 (12 years ago)

Author:

tbretz

Message:

Added locking to subscription and unsubscription of events. This doesn't happen often, so it shouldn't harm. The advantage is that subsccriptions can happen even if there are still afew events in the queue. Note that the constructor is not locked, so it must be ensured that no Subscriptions or Unssubscriptions happen during the construction.

Location:

trunk/FACT++/src

Files:

• StateMachineImp.cc (modified) (9 diffs)
• StateMachineImp.h (modified) (3 diffs)

trunk/FACT++/src/StateMachineImp.cc

@@ -384 +384 @@
 //!    The event names all have the SERVER/ pre-fix removed.
 //
-const vector<string> StateMachineImp::GetEventNames() const
+const vector<string> StateMachineImp::GetEventNames()
 {
     vector<string> v;
@@ -391 +391 @@
     const int     len  = name.length();
 
+    const lock_guard<mutex> guard(fMutexEvt);
+
     for (vector<EventImp*>::const_iterator i=fListOfEvents.begin();
          i!=fListOfEvents.end(); i++)
@@ -413 +415 @@
 //!    if given only the given event is selected
 //
-void StateMachineImp::PrintListOfEvents(ostream &out, const string &evt) const
-{
+void StateMachineImp::PrintListOfEvents(ostream &out, const string &evt)
+{
+    const lock_guard<mutex> guard(fMutexEvt);
+
     for (vector<EventImp*>::const_iterator c=fListOfEvents.begin(); c!=fListOfEvents.end(); c++)
         if (evt.empty() || GetName()+'/'+evt==(*c)->GetName())
@@ -429 +433 @@
 //!
 //
-void StateMachineImp::PrintListOfAllowedEvents(ostream &out) const
-{
+void StateMachineImp::PrintListOfAllowedEvents(ostream &out)
+{
+    const lock_guard<mutex> guard(fMutexEvt);
+
     for (vector<EventImp*>::const_iterator c=fListOfEvents.begin(); c!=fListOfEvents.end(); c++)
         if ((*c)->IsStateAllowed(fCurrentState))
@@ -444 +450 @@
 //
 //
-void StateMachineImp::PrintListOfEvents(const string &str) const
+void StateMachineImp::PrintListOfEvents(const string &str)
 {
     PrintListOfEvents(Out(), str);
@@ -485 +491 @@
 //!    true if the event was found, false otherwise
 //
-bool StateMachineImp::HasEvent(const EventImp *cmd) const
+bool StateMachineImp::HasEvent(const EventImp *cmd)
 {
     // Find the event from the list of commands and queue it
+    const lock_guard<mutex> guard(fMutexEvt);
     return find(fListOfEvents.begin(), fListOfEvents.end(), cmd)!=fListOfEvents.end();
 }
@@ -500 +507 @@
 //!    true if the event was found, false otherwise
 //
-EventImp *StateMachineImp::FindEvent(const string &evt) const
+EventImp *StateMachineImp::FindEvent(const string &evt)
 {
     // Find the command from the list of commands and queue it
+    const lock_guard<mutex> guard(fMutexEvt);
     for (vector<EventImp*>::const_iterator c=fListOfEvents.begin(); c!=fListOfEvents.end(); c++)
         if (evt == (*c)->GetName())
@@ -546 +554 @@
 #endif
 
+    fMutexEvt.lock();
     fListOfEvents.push_back(evt);
+    fMutexEvt.unlock();
 
     return *evt;
@@ -611 +621 @@
 {
     EventImp *evt = CreateService(name);
+
+    fMutexEvt.lock();
     fListOfEvents.push_back(evt);
+    fMutexEvt.unlock();
+
     return *evt;
+}
+
+void StateMachineImp::Unsubscribe(EventImp *evt)
+{
+    const lock_guard<mutex> guard(fMutexEvt);
+
+    auto it = find(fListOfEvents.begin(), fListOfEvents.end(), evt);
+    if (it==fListOfEvents.end())
+        return;
+
+    fListOfEvents.erase(it);
+    delete evt;
 }
 

trunk/FACT++/src/StateMachineImp.h

@@ -41 +41 @@
     std::queue<Event*>     fEventQueue;   /// Event queue (fifo) for the received commands
 
-    std::mutex fMutex;   /// Mutex to ensure thread-safe access to the command fifo
+    std::mutex fMutex;    /// Mutex to ensure thread-safe access to the command fifo
+    std::mutex fMutexEvt; /// Mutex to ensure thread-safe access to the command fifo
 
     bool fRunning;       /// Machine is in main-loop
@@ -101 +102 @@
 
     EventImp &Subscribe(const std::string &name);
+    void Unsubscribe(EventImp *evt);
 
     /// return the current state of the machine
@@ -128 +130 @@
 
     // Event handling
-    bool HasEvent(const EventImp *cmd) const;
-    EventImp *FindEvent(const std::string &evt) const;
+    bool HasEvent(const EventImp *cmd);
+    EventImp *FindEvent(const std::string &evt);
 
     bool IsQueueEmpty() const { return fEventQueue.size()==0; }
 
-    const std::vector<EventImp*> &GetListOfEvents() const { return fListOfEvents; }
-    const std::vector<std::string> GetEventNames() const;
-
-    void PrintListOfEvents(std::ostream &out, const std::string &evt="") const;
-    void PrintListOfEvents(const std::string &str="") const;
-
-    void PrintListOfAllowedEvents(std::ostream &out) const;
-    void PrintListOfAllowedEvents() const;
+    //const std::vector<EventImp*> &GetListOfEvents() const { return fListOfEvents; }
+    const std::vector<std::string> GetEventNames();
+
+    void PrintListOfEvents(std::ostream &out, const std::string &evt="");
+    void PrintListOfEvents(const std::string &str="");
+
+    void PrintListOfAllowedEvents(std::ostream &out);
+    void PrintListOfAllowedEvents();
 
     void PrintListOfStates(std::ostream &out) const;