Changeset 14551

Timestamp:

11/03/12 18:52:18 (12 years ago)

Author:

tbretz

Message:

Fixed a severe bug which caused some events tobe added twice and implemented a callback for state changes

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (2 diffs)
• StateMachineDimControl.h (modified) (2 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -297 +297 @@
     fMutex.unlock();
 
+    fStateCallback(server, state);
+
     return GetCurrentState();
 }
@@ -342 +344 @@
     if (server!="DIS_DNS")
     {
-        DimDescriptions *d = new DimDescriptions(server);
-
-        fDimDescriptionsList.push_back(d);
-        d->SetCallback(bind(&StateMachineDimControl::HandleStateChange, this, server, d));
-        d->SetCallbackStates(bind(&StateMachineDimControl::HandleStates, this, server, d));
-        d->SetCallbackDescriptions(bind(&StateMachineDimControl::HandleDescriptions, this, d));
-        d->Subscribe(*this);
+        struct Find : string
+        {
+            Find(const string &ref) : string(ref) { }
+            bool operator()(const DimDescriptions *dim) { return *this==dim->server; }
+        };
+
+        if (find_if(fDimDescriptionsList.begin(), fDimDescriptionsList.end(),
+                    Find(server))==fDimDescriptionsList.end())
+        {
+            DimDescriptions *d = new DimDescriptions(server);
+
+            fDimDescriptionsList.push_back(d);
+            d->SetCallback(bind(&StateMachineDimControl::HandleStateChange, this, server, d));
+            d->SetCallbackStates(bind(&StateMachineDimControl::HandleStates, this, server, d));
+            d->SetCallbackDescriptions(bind(&StateMachineDimControl::HandleDescriptions, this, d));
+            d->Subscribe(*this);
+        }
     }
 

trunk/FACT++/src/StateMachineDimControl.h

@@ -21 +21 @@
     std::map<std::pair<std::string, int32_t>, std::pair<std::string, std::string>> fStateDescriptionList;
     std::map<std::string, std::vector<Description>> fServiceDescriptionList;
+
+    std::function<void(const std::string &, const State&)> fStateCallback;
 
     DimVersion fDim;
@@ -63 +65 @@
     void SendDimCommand(const std::string &server, std::string str, std::ostream &lout);
 
+    void SetStateCallback(const std::function<void(const std::string &, const State &)> &func) { fStateCallback = func; }
+
 public:
     StateMachineDimControl(std::ostream &out=std::cout);