Changeset 13702 for trunk

Timestamp:

05/13/12 15:38:46 (13 years ago)

Author:

tbretz

Message:

Slight change to the meaning of labels; added the direct exit to th eexecution loop; implemented interruption of state waiting

Location:

trunk/FACT++/src

Files:

• Readline.cc (modified) (5 diffs)
• Readline.h (modified) (1 diff)
• RemoteControl.h (modified) (2 diffs)
• dimctrl.cc (modified) (3 diffs)

trunk/FACT++/src/Readline.cc

@@ -71 +71 @@
 
 Readline *Readline::This   =  0;
-int       Readline::fLabel = -2;
+int       Readline::fLabel = -3;
 
 // --------------------------------------------------------------------------
@@ -1248 +1248 @@
         return 0;
 
-    SetSection(-1);
+    SetSection(-2);
     fLabel = -1;
 
@@ -1263 +1263 @@
     if (!fin)
     {
-        SetSection(-2);
+        SetSection(-3);
         return -1;
     }
@@ -1272 +1272 @@
     fCommandLog << ")" << endl;
 
-    SetSection(0);
+    SetSection(-1);
 
     int rc = 0;
 
     string buffer;
-    while (getline(fin, buffer, '\n'))
+    while (getline(fin, buffer, '\n') && fLabel>-2)
     {
         buffer = Tools::Trim(buffer);
@@ -1304 +1304 @@
 
     fLabel = -1;
-    SetSection(-2);
+    SetSection(-3);
 
     fCommandLog << "# " << Time() << " - " << name << " (FINISHED)" << endl;

trunk/FACT++/src/Readline.h

@@ -100 +100 @@
     void         ProcessLine(const std::string &str);
     static  void SetLabel(int l) { fLabel = l; }
+    static  int  GetLabel() { return fLabel; }
 
     int GetLine() const { return fLine; }

trunk/FACT++/src/RemoteControl.h

@@ -68 +68 @@
     int Write(const Time &time, const std::string &txt, int qos=kMessage)
     {
+        if (!fImp)
+            return 0;
         return fImp ? fImp->Write(time, txt, qos) : MessageImp::Write(time, txt, qos);
     }
@@ -213 +215 @@
             T::GetStreamOut().SetBacklog(false);
             T::GetStreamOut().SetNullOutput(false);
-            while (l->second->GetState()!=state && timeout>Time())
+            while (l->second->GetState()!=state && timeout>Time() && T::GetLabel()!=-2)
                 usleep(1);
             T::GetStreamOut().SetNullOutput(true);
             T::GetStreamOut().SetBacklog(true);
 
-            if (l->second->GetState()!=state)
+            if (T::GetLabel()!=0 && l->second->GetState()!=state)
             {
                 int label = -1;

trunk/FACT++/src/dimctrl.cc

@@ -95 +95 @@
         {
             Debug("Stop received");
-            Readline::SetLabel(0);
+            Readline::SetLabel(-2);
         }
 
@@ -165 +165 @@
             {
                 string msg;
-                if (fLabel<0)
+                switch (fLabel)
                 {
-                    if (fLabel==-1)
-                        msg = Line("Begin ["+fScript+"]", '=');
-                    else
-                        msg = Line("End ["+fScript+"]", '=');
-                }
-                else
-                {
-                    ostringstream out;
-                    out << "Label " << fLabel << " [" << fScript << "]";
-                    msg = Line(out.str(), '-');
+                case -3: msg = Line("End ["+fScript+"]", '=');   break;
+                case -2: msg = Line("Load ["+fScript+"]", '=');  break;
+                case -1: msg = Line("Begin ["+fScript+"]", '-'); break;
+                default:
+                    {
+                        ostringstream out;
+                        out << "Label " << fLabel << " [" << fScript << "]";
+                        msg = Line(out.str(), '-');
+                    }
                 }
 
@@ -185 +184 @@
             switch (fLabel)
             {
-            case -2: return fSrvState.Update(fScript+" [end]");
-            case -1: return fSrvState.Update(fScript+" [load]");
-            case  0: return fSrvState.Update(fScript+" [start]");
+            case -3: return fSrvState.Update(fScript+" [end]");
+            case -2: return fSrvState.Update(fScript+" [load]");
+            case -1: return fSrvState.Update(fScript+" [start]");
             }