Changeset 14351 for trunk

Timestamp:

08/13/12 09:49:32 (12 years ago)

Author:

tbretz

Message:

The state from the callback was not yet properly propagated. Implemented kSM_KeepState to signal that the state should not change.

Location:

trunk/FACT++/src

Files:

• DimState.h (modified) (14 diffs)
• RemoteControl.h (modified) (2 diffs)
• StateMachineImp.h (modified) (3 diffs)

trunk/FACT++/src/DimState.h

@@ -22 +22 @@
 
 protected:
-    typedef std::function<void(const EventImp &)> callback;
+    typedef std::function<int(const EventImp &)> callback;
 
     callback fCallback;
@@ -36 +36 @@
     }
 
-    void Callback(const EventImp &evt)
-    {
-        if (fCallback)
-            fCallback(evt);
-    }
-
-    virtual void Handler(const EventImp &evt)
+    int Callback(const EventImp &evt)
+    {
+        return fCallback ? fCallback(evt) : StateMachineImp::kSM_KeepState;
+    }
+
+    virtual int Handler(const EventImp &evt)
     {
         HandlerImp(evt);
-        Callback(evt);
+        return Callback(evt);
     }
 
@@ -145 +144 @@
     }
 
-    void HandleDesc(const EventImp &evt)
+    int HandleDesc(const EventImp &evt)
     {
         if (evt.GetSize()>0)
@@ -154 +153 @@
             CallbackStates();
         }
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -200 +201 @@
 
 
-    void HandleServiceDesc(const EventImp &evt)
+    int HandleServiceDesc(const EventImp &evt)
     {
         descriptions.clear();
@@ -212 +213 @@
 
         CallbackDescriptions();
+
+        return StateMachineImp::kSM_KeepState;
     }
 };
@@ -217 +220 @@
 class DimVersion : public DimState
 {
-    void Handler(const EventImp &evt)
+    int Handler(const EventImp &evt)
     {
         HandlerImp(evt);
@@ -225 +228 @@
             cur.second=kOffline;
 
-        Callback(evt);
+        return Callback(evt);
     }
 
@@ -251 +254 @@
     std::map<std::string, callback> fCallbacks;
 
-    void Handler(const EventImp &evt)
+    int Handler(const EventImp &evt)
     {
         HandlerImp(evt);
@@ -262 +265 @@
         const size_t p0 = msg.find_first_of(':');
         if (p0==std::string::npos)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         // Evaluate scriptdepth
@@ -272 +275 @@
         const size_t p1 = msg.find_last_of('[');
         if (p1==std::string::npos)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         const size_t p2 = msg.find_first_of(':', p0+1);
@@ -282 +285 @@
         shortmsg.erase(p0, p3-p0);
 
-        Callback(evt);
+        const int rc = Callback(evt);
 
         const auto func = fCallbacks.find(file);
         if (func==fCallbacks.end())
-            return;
+            return rc;
 
         // Call callback
-        func->second(evt);
+        return func->second(evt);
     }
 
@@ -340 +343 @@
             fCallbackServerEvent(evt);
     }
-    virtual void HandlerServer(const EventImp &evt)
+    virtual int HandlerServer(const EventImp &evt)
     {
         HandlerServerImp(evt);
         CallbackServerEvent(evt);
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -424 +429 @@
     }
 */
-    virtual void HandlerServiceList(const EventImp &evt)
+    virtual int HandlerServiceList(const EventImp &evt)
     {
         HandlerServiceListImp(evt);
         //CallbackServiceEvent(evt);
+
+        return StateMachineImp::kSM_KeepState;
     }
 

trunk/FACT++/src/RemoteControl.h

@@ -249 +249 @@
     }
 
-    void Handle(const EventImp &evt, const string &service)
+    int Handle(const EventImp &evt, const string &service)
     {
         const lock_guard<mutex> lock(fMutex);
@@ -261 +261 @@
             it->second.second = static_cast<Event>(evt);
         }
+
+        return StateMachineImp::kSM_KeepState;
     }
 

trunk/FACT++/src/StateMachineImp.h

@@ -21 +21 @@
     enum DefaultStates_t
     {
+        kSM_KeepState    =    -42,  ///< 
         kSM_NotReady   =     -1,  ///< Mainloop not running, state machine stopped
         kSM_Ready      =      0,  ///< Mainloop running, state machine in operation
@@ -68 +69 @@
     virtual void UnLock() { }
 
-    int Wrapper(const std::function<void(const EventImp &)> &f, const EventImp &imp)
+    int Wrapper(const std::function<int(const EventImp &)> &f, const EventImp &imp)
     {
-        f(imp);
-        return GetCurrentState();
+        const int rc = f(imp);
+        return rc==kSM_KeepState ? GetCurrentState() : rc;
     }
 
@@ -94 +95 @@
     ~StateMachineImp();
 
-    std::function<int(const EventImp &)> Wrap(const std::function<void(const EventImp &)> &func)
+    std::function<int(const EventImp &)> Wrap(const std::function<int(const EventImp &)> &func)
     {
         return bind(&StateMachineImp::Wrapper, this, func, std::placeholders::_1);