Changeset 11061

Timestamp:

06/18/11 17:48:17 (13 years ago)

Author:

tbretz

Message:

Improved the output when a command was added; suppress anything inside Run() if fExitStatus was set already before Run() was called

File:

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

trunk/FACT++/src/StateMachineImp.cc

@@ -548 +548 @@
 
     Out() << ":   " << Time().GetAsStr() << " - Adding command " << evt->GetName();
-    Out() << " (transition to " << GetStateDescription(evt->GetTargetState()) << ")" << endl;
+    if (evt->GetTargetState()>=0)
+        Out() << " (transition to " << GetStateDescription(evt->GetTargetState()) << ")";
+    Out() << endl;
+
 
     fListOfEvents.push_back(evt);
@@ -1045 +1048 @@
     }
 
-    fRunning = !dummy;
-
-    SetCurrentState(kSM_Ready, "by Run()");
-
-    while (!fExitRequested)
-    {
-        usleep(1);
-        if (dummy)
-            continue;
-
-        // Execute a step in the current state of the state machine
-        if (!HandleNewState(Execute(), "by Execute-command"))
-            break;
-
-        // If the command stack is empty go on with processing in the
-        // current state
-        if (IsQueueEmpty())
-            continue;
-
-        // Pop the next command which arrived from the stack
-        const auto_ptr<Event> cmd(PopEvent());
-
-        if (!HandleEvent(*cmd))
-            break;
-    }
-
-    fRunning = false;
-
     if (!fExitRequested)
     {
-        Fatal("Fatal Error occured... shutting down.");
-        return -1;
-    }
-
-    SetCurrentState(kSM_NotReady, "due to return from Run().");
+        fRunning = !dummy;
+
+        SetCurrentState(kSM_Ready, "by Run()");
+
+        while (!fExitRequested)
+        {
+            usleep(1);
+            if (dummy)
+                continue;
+
+            // Execute a step in the current state of the state machine
+            if (!HandleNewState(Execute(), "by Execute-command"))
+                break;
+
+            // If the command stack is empty go on with processing in the
+            // current state
+            if (IsQueueEmpty())
+                continue;
+
+            // Pop the next command which arrived from the stack
+            const auto_ptr<Event> cmd(PopEvent());
+
+            if (!HandleEvent(*cmd))
+                break;
+        }
+
+        fRunning = false;
+
+        if (!fExitRequested)
+        {
+            Fatal("Fatal Error occured... shutting down.");
+            return -1;
+        }
+
+        SetCurrentState(kSM_NotReady, "due to return from Run().");
+    }
 
     const int exitcode = fExitRequested-1;