Changeset 14124 for trunk/FACT++/src/StateMachineImp.h

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.

File:

• trunk/FACT++/src/StateMachineImp.h (modified) (3 diffs)

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;