Changeset 2955 in Sophya for trunk/SophyaLib/SysTools/commander.cc

Timestamp:

May 29, 2006, 7:27:35 PM (19 years ago)

Author:

ansari

Message:

Ajout gestionnaire signal ds ZThread et correction/adaptation gestion des threads (killthr) dans Commander - Reza 29 mai 2006

File:

• trunk/SophyaLib/SysTools/commander.cc (modified) (6 diffs)

trunk/SophyaLib/SysTools/commander.cc

@@ -443 +443 @@
 static Commander* cur_commander = NULL;
 /* --Methode-- */
-//! Default constructor. Initializes variable list and copies \c history.pic to \c hisold.pic
-Commander::Commander()
+/*! 
+  \brief Constructor. Initializes variable list and copies \c history.pic to \c hisold.pic
+  if \b fgsigstop == true , calls ZThread::ActivateExitOnSignal()
+*/
+Commander::Commander(bool fgsigzt)
 {
 system("cp history.pic hisold.pic");
@@ -512 +515 @@
 usage += "  > thrlist       # List of command execution threads (& as the last character) \n";
 usage += "  > clearthrlist  # Removes finished threads from the list  \n";
-usage += "  > stopthr Id    # Try to stop a given thread (ThrId=id) sending SIGUSR1 \n";
+usage += "  > killthr Id    # Try to stop a given thread (ThrId=id) by sending SIGUSR1 \n";
+usage += "  > cancelthr Id  # Try to cancel a given thread (ThrId=id)  \n";
 usage += "  > waitthr       # Waits until all active threads have finished (join()) \n";
 usage += "  > exec filename # Execute commands from file \n";
@@ -577 +581 @@
 AddInterpreter(this);
 curcmdi = this;
+if (fgsigzt) ZThread::ActivateExitOnSignal(SIGUSR1);
 }
 
@@ -1878 +1883 @@
   return(0);
 }
-else if (kw == "stopthr") {
-  if (tokens.size() < 1) { cout << "Commander::Interpret() Usage: stopthr thrid" << endl;  return(0); }
+else if ( (kw == "killthr") || (kw == "cancelthr") )  {
+  if (tokens.size() < 1) { 
+    cout << "Commander::Interpret() Usage: killthr/cancelthr thrid" << endl;  
+    return(0); 
+  }
   uint_8  id = atol(tokens[0].c_str());
-  StopThr(id);
+  bool fgkill = false;
+  if (kw == "killthr")  fgkill = true;
+  StopThr(id, fgkill);
   return (0);
 }
@@ -2026 +2036 @@
 void Commander::ListThreads()
 {
-  cout << "---- Commander::ListThreads()  List of separate execution threads NThread=" 
-       <<  CmdThrExeList.size() << " ----- " << endl;
+  cout << "--- Commander::ListThreads()- command execution threads NThread=" 
+       <<  CmdThrExeList.size() << " ---" << endl;
   for(list<CommandExeThr *>::iterator tit = CmdThrExeList.begin(); 
       tit != CmdThrExeList.end(); tit++) {
     cout << "Id=" << (*tit)->Id(); 
-    if ( (*tit)->IfDone() )  cout << " Finished , Rc= " << (*tit)->getRC();
-    else cout << " Executing";
-    cout << " (Cmd= " << (*tit)->Keyword() << " " << (*tit)->Tokens() << " )" << endl; 
-  }
-}
-/* --Methode-- */
-void Commander::StopThr(uint_8 id)
+    if ( (*tit)->IfRunning() )  cout << " Executing";
+    else if ( (*tit)->IfDone() )  cout << " Finished , Rc= " << (*tit)->getRC();
+    else cout << " Stopped/Canceled";
+    cout << " (Cmd= " << (*tit)->Keyword() << " " << (*tit)->Tokens().substr(0,35);
+    if ((*tit)->Tokens().length() > 35) cout << "... )" << endl;
+    else cout << " )" << endl;
+  }
+}
+/* --Methode-- */
+void Commander::StopThr(uint_8 id, bool fgkill)
 {
   for(list<CommandExeThr *>::iterator tit = CmdThrExeList.begin(); 
       tit != CmdThrExeList.end(); tit++) {
-    if ( ((*tit)->Id() == id) && !((*tit)->IfDone()) ) { 
-      (*tit)->kill(SIGUSR1);  
-      cout << "Commander::StopThr()  Send signal SIGUSR1 to Thread Id= " << id << endl;
+    if ( ((*tit)->Id() == id) && ((*tit)->IfRunning()) ) { 
+      if (fgkill) {
+        (*tit)->kill(SIGUSR1);  
+        cout << "Commander::StopThr()  Send signal SIGUSR1 to Thread Id= " << id << endl;
+      }
+      else {
+        (*tit)->cancel();
+        cout << "Commander::StopThr()  Canceling Thread Id= " << id << endl;
+      }
       return;
     }
@@ -2055 +2074 @@
   cout << "---- Commander::CleanThrList()  Cleaning thrlist  ----- \n";
   list<CommandExeThr *> thrcopie;
+  int ncl = 0;
   for(list<CommandExeThr *>::iterator tit = CmdThrExeList.begin(); 
       tit != CmdThrExeList.end(); tit++) {
-    if ( (*tit)->IfDone() ) { 
+    if ( ((*tit)->IfEnded() || (*tit)->IfStopped()) && (ncl < 3) ) { 
       cout << " Thread Id= " << (*tit)->Id() << " rc= " << (*tit)->getRC() << " Cleaned" << endl;
       delete (*tit);
+      ncl++;
     }
     else thrcopie.push_back((*tit));