Changeset 15239

Timestamp:

04/04/13 11:16:29 (12 years ago)

Author:

tbretz

Message:

Fixed a race-condition during configuration with the states of the ratecontrol.

File:

• trunk/FACT++/src/mcp.cc (modified) (2 diffs)

trunk/FACT++/src/mcp.cc

@@ -309 +309 @@
             Dim::SendCommandNB("FTM_CONTROL/CONFIGURE", fRunType);
 
+            // That's a bit stupid, but we have to stop the ratecontrol
+            // first, otherwise it might be detected to be
+            // in a state larger than Connected in Configuring3
+            // (because it still was) before the state change introduced
+            // by the Configuring2 state is even received. If instead
+            // we wait in Configuring2 for the rate control to be connected,
+            // we can be sure that it works.
+            Message("Stopping ratecontrol");
+            Dim::SendCommandNB("RATE_CONTROL/STOP");
+
             Update(MCP::State::kConfiguring2);
             return MCP::State::kConfiguring2;
@@ -320 +330 @@
             if ((/*fDimFTM.state() != FTM::State::kConfiguring2 &&*/
                  fDimFTM.state() != FTM::State::kConfigured) ||
-                fDimLog.state()<30 || fDimLog.state()>0xff)
+                fDimLog.state()<30 || fDimLog.state()>0xff ||
+                fDimRC.state()!=RateControl::State::kConnected)
                 return MCP::State::kConfiguring2;