Changeset 14370 for trunk

Timestamp:

08/14/12 12:28:37 (12 years ago)

Author:

tbretz

Message:

Adapted ChangeState to properly send informations; adapted Write to keep mssages in sync; renamed DIM_CONTROL2 to DIM_CONTROL

File:

• trunk/FACT++/src/StateMachineDimControl.cc (modified) (5 diffs)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -31 +31 @@
 int StateMachineDimControl::ChangeState(int qos, const Time &time, int scriptdepth, string scriptfile, string user)
 {
-    ostringstream pid;
-    pid << getpid();
-
     string msg;
+    /*
     switch (qos)
     {
@@ -47 +45 @@
         }
     }
-
-    if (qos<0)
-        msg += "-"+to_string(scriptdepth);
-
-    msg += ": "+scriptfile+" ["+user+":"+pid.str()+"]";
-
-    if (fDebug)
-        Write(time, Line(msg, qos<-1 ? '=' :'-'), 90);
+    */
+
+    //if (qos<0)
+        msg += to_string(scriptdepth);
+
+    msg += ":"+scriptfile+"["+user+":"+to_string(getpid())+"]";
+
+    //if (fDebug)
+    //Write(time, Line(msg, qos<-1 ? '=' :'-'), MessageImp::kInternal);
 
     if (qos==-3)
         fScriptUser = fUser;
 
-    return qos+3;
+    SetCurrentState(qos+3, msg.c_str());
+    //SetCurrentState(qos+3, Line(msg, qos<-1 ? '=' :'-').c_str());
+    return GetCurrentState();
+
+    //return qos+3;
 }
 
@@ -66 +69 @@
     if (txt=="")
     {
+        return ChangeState(qos, time, Readline::GetScriptDepth(), Readline::GetScript(), fScriptUser);
+        /*
+         === This might be necessary for thread safety,
+         === but it break that the signal for the start of a new
+         === script arrives synchronously before the first output
+         === from the script
+
         // Post an anonymous event to the event loop
         Event evt("");
@@ -72 +82 @@
                                 Readline::GetScript(), fScriptUser));
         return PostEvent(evt);
+        */
     }
 
@@ -426 +437 @@
 }
 
-StateMachineDimControl::StateMachineDimControl(ostream &out) : StateMachineDim(out, fIsServer?"DIM_CONTROL2":"")
+StateMachineDimControl::StateMachineDimControl(ostream &out) : StateMachineDim(out, fIsServer?"DIM_CONTROL":"")
 {
     fDim.Subscribe(*this);