Changeset 10273 for trunk/FACT++

Timestamp:

03/30/11 15:55:03 (14 years ago)

Author:

tbretz

Message:

Adapted to new interface of Converter class, added the possibility to run a dummy loop.

Location:

trunk/FACT++/src

Files:

• StateMachineImp.cc (modified) (6 diffs)
• StateMachineImp.h (modified) (1 diff)

trunk/FACT++/src/StateMachineImp.cc

@@ -233 +233 @@
     lout << kBlue << name;
 
+    const Converter conv(lout, fmt, false);
+
+    const vector<char> v = conv.GetVector(str.substr(p0));
+    if (!conv.valid() || v.empty()!=conv.empty())
+    {
+        lout << kRed << "Couldn't properly parse the input... ignored." << endl;
+        return false;
+    }
+
+    return PostEvent(*evt, v.data(), v.size());
+/*
     const Converter c(lout, fmt, str.substr(p0));
 
@@ -243 +254 @@
 
     return PostEvent(*evt, c.Ptr(), c.Size());
+    */
 }
 
@@ -470 +482 @@
     evt->AddAllowedStates(states);
 
-    Out() << ":   " << Time().GetAsStr() << ": Adding command " << evt->GetName();
+    Out() << ":   " << Time().GetAsStr() << " - Adding command " << evt->GetName();
     Out() << " (transition to " << GetStateDescription(evt->GetTargetState()) << ")" << endl;
 
@@ -912 +924 @@
 //!   \enddot
 //!
+//! @param dummy
+//!    If this parameter is set to treu then no action is executed
+//!    and now events are dispatched from the event list. It is usefull
+//!    if functions are assigned directly to any event to simulate
+//!    a running loop (e.g. block until Stop() was called or fExitRequested
+//!    was set by an EXIT command.
+//!
 //! @returns
 //!    In the case of a a fatal error -1 is returned, fExitRequested-1 in all
@@ -919 +938 @@
 //! @todo  Fix docu (kSM_SetReady, HandleEvent)
 //
-int StateMachineImp::Run()
+int StateMachineImp::Run(bool dummy)
 {
     if (fCurrentState>=kSM_Ready)
@@ -935 +954 @@
     {
         usleep(1);
+        if (dummy)
+            continue;
 
         // Execute a step in the current state of the state machine

trunk/FACT++/src/StateMachineImp.h

@@ -93 +93 @@
 
     /// Start the mainloop
-    int Run();
+    int Run(bool dummy=false);
 
     /// Request to stop the mainloop