Changeset 13897

Timestamp:

05/25/12 23:07:11 (13 years ago)

Author:

tbretz

Message:

Updated the handling of labels and how a script is stopped.

Location:

trunk/FACT++/src

Files:

• LocalControl.h (modified) (1 diff)
• Readline.cc (modified) (9 diffs)
• RemoteControl.h (modified) (1 diff)
• dimctrl.cc (modified) (2 diffs)

trunk/FACT++/src/LocalControl.h

@@ -121 +121 @@
 
             const int target = stoi(str.substr(3));
-            while (fStateMachine->GetCurrentState()!=target && timeout>Time())
+            while (fStateMachine->GetCurrentState()!=target && timeout>Time() && !T::IsScriptStopped())
                 usleep(1);
 
-            if (fStateMachine->GetCurrentState()!=target)
+            if (fStateMachine->GetCurrentState()==target)
+                return true;
+
+            int label = -1;
+            in >> label;
+            if (in.fail() && !in.eof())
             {
-                int label = -1;
-                in >> label;
-                T::SetLabel(label);
+                lout << kRed << "Invalid label in '" << str.substr(3) << "'" << endl;
+                T::StopScript();
+                return true;
             }
+            T::SetLabel(label);
+
             return true;
         }

trunk/FACT++/src/Readline.cc

@@ -71 +71 @@
 
 Readline   *Readline::This   =  0;
-int         Readline::fLabel = -3;
+bool        Readline::fStopScript = false;
 std::string Readline::fScript;
 
@@ -98 +98 @@
 //
 Readline::Readline(const char *prgname) :
-    fMaxLines(500), fLine(0), fCompletion(0)
+    fMaxLines(500), fLine(0), fScriptDepth(0), fCompletion(0)
 {
     if (This)
@@ -1011 +1011 @@
         try
         {
-            const int section = stoi(str.substr(1));
-            SetSection(section);
-
-            if (fLabel!=section)
+            fSection = stoi(str.substr(1));
+            SetSection(fSection);
+
+            if (fLabel!=fSection)
                 return true;
         }
@@ -1073 +1073 @@
         }
 
+        const int save = fSection;
         Execute(opt, data);
+        fSection = save;
+        SetSection(save);
+
         return true;
     }
@@ -1335 +1339 @@
     fScript = name;
 
+    fSection = -2;
     SetSection(-2);
     fLabel = -1;
@@ -1348 +1353 @@
     if (!fin)
     {
+        fSection = -3;
         SetSection(-3);
         return -1;
@@ -1357 +1363 @@
     fCommandLog << ")" << endl;
 
+    if (fScriptDepth++==0)
+        fStopScript = false;
+
+    fSection = -1;
     SetSection(-1);
 
@@ -1362 +1372 @@
 
     string buffer;
-    while (getline(fin, buffer, '\n') && fLabel>-2)
+    while (getline(fin, buffer, '\n') && !fStopScript)
     {
         buffer = Tools::Trim(buffer);
@@ -1389 +1399 @@
 
     fLabel = -1;
+    fSection = -3;
     SetSection(-3);
+
+    if (--fScriptDepth==0)
+        fStopScript = false;
 
     fCommandLog << "# " << Time() << " - " << name << " (FINISHED)" << endl;

trunk/FACT++/src/RemoteControl.h

@@ -222 +222 @@
             T::GetStreamOut().SetBacklog(false);
             T::GetStreamOut().SetNullOutput(false);
-            while (l->second->GetState()!=state && timeout>Time() && T::GetLabel()!=-2)
+            while (l->second->GetState()!=state && timeout>Time() && !T::IsScriptStopped())
                 usleep(1);
             T::GetStreamOut().SetNullOutput(true);
             T::GetStreamOut().SetBacklog(true);
 
-            if (T::GetLabel()!=-2 && l->second->GetState()!=state)
-            {
-                int label = -1;
-                in >> label;
-                if (in.fail() && !in.eof())
-                {
-                    lout << kRed << "Invalid label in '" << str.substr(3) << "'" << endl;
-                    label = -2;
-                }
-                else
-                    T::SetLabel(label);
-            }
+            if (l->second->GetState()==state)
+                return true;
+
+            int label = -1;
+            in >> label;
+            if (in.fail() && !in.eof())
+            {
+                lout << kRed << "Invalid label in '" << str.substr(3) << "'" << endl;
+                T::StopScript();
+                return true;
+            }
+            T::SetLabel(label);
 
             return true;

trunk/FACT++/src/dimctrl.cc

@@ -107 +107 @@
 
             Debug(msg);
-            Readline::SetLabel(-2);
+            Readline::StopScript();
         }
 
@@ -256 +256 @@
     }
 
-    void Stop(int stop=0) { fStop = stop; Readline::SetLabel(0); }
+    void Stop(int stop=0) { fStop = stop; Readline::StopScript(); }
     int Run(bool)
     {