Changeset 14362 for trunk/FACT++/src

Timestamp:

08/13/12 21:23:17 (12 years ago)

Author:

tbretz

Message:

Return codes for state handlers were missing.

File:

• trunk/FACT++/src/smartfact.cc (modified) (11 diffs)

trunk/FACT++/src/smartfact.cc

@@ -713 +713 @@
     }
 
-    void HandleControlStateChange(const EventImp &d)
+    int HandleControlStateChange(const EventImp &d)
     {
         if (d.GetSize()==0)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         // [0] DimControl::kReady (Idle)
@@ -731 +731 @@
 
         if (d.GetQoS()>=2)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
 #if BOOST_VERSION < 104600
@@ -742 +742 @@
         if (!file.empty())
             HandleControlMessageImp(Event(d, file.data(), file.length()+1));
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -757 +759 @@
     }
 
-    void HandleFscControlStateChange(const EventImp &d)
+    int HandleFscControlStateChange(const EventImp &d)
     {
         const int32_t &last  = fDimFscControl.last.second;
@@ -763 +765 @@
 
         if (last==DimState::kOffline || state==DimState::kOffline)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         if (last<FSC::State::kConnected && state==FSC::State::kConnected)
@@ -776 +778 @@
             SetAudio("shutdown");
         }
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -924 +928 @@
     }
 
-    void HandleDriveControlStateChange(const EventImp &d)
+    int HandleDriveControlStateChange(const EventImp &d)
     {
         const int32_t &last  = fDimFscControl.last.second;
@@ -930 +934 @@
 
         if (last==DimState::kOffline || state==DimState::kOffline)
-            return;
+            return StateMachineImp::kSM_KeepState;
 
         if (last<Drive::State::kArmed && state>=Drive::State::kArmed)
@@ -937 +941 @@
         if (last>=Drive::State::kArmed && state<Drive::State::kArmed)
             AddMcpConfigurationHist(d, "Drive disconnected");
+
+        return StateMachineImp::kSM_KeepState;
     }
 
@@ -1757 +1763 @@
     // -------------------------------------------------------------------
 
-    void HandleDoTest(const EventImp &d)
+    int HandleDoTest(const EventImp &d)
     {
         ostringstream out;
@@ -1771 +1777 @@
 
         ofstream(fPath+"/dotest.data") << out.str();
+
+        return StateMachineImp::kSM_KeepState;
     }