Changeset 2955 in Sophya for trunk/SophyaLib/SysTools/zthread.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/zthread.cc (modified) (9 diffs)

trunk/SophyaLib/SysTools/zthread.cc

@@ -47 +47 @@
 extern "C" {
   void * zthr_run( void * xthr);
-}
-*/
-
+  void zthr_sig_exit(int s);
+}
+*/
+
+static int _RCR_ = 99;
 static void * zthr_run(void * xthr)
 {
   ZThread * thr = (ZThread *)xthr;
-  thr->run();
-  pthread_exit(NULL);
-  return NULL;
-}
-
+  thr->run_p();
+  return &_RCR_;
+}
+
+static void zthr_cleanup(void * xthr)
+{
+  ZThread * thr = (ZThread *)xthr;
+  if(thr->_status == 1) thr->_status = 2;
+  return;
+}
+
+static int _RCS_ = 97;
+static void zthr_sig_exit(int s)
+{
+  printf("zthr_sig_exit(int s=%d)  signal received -> pthread_exit()\n",s);
+  pthread_exit(&_RCS_);
+}
 
 /* ------ Classe ZThread  -------  */
@@ -65 +79 @@
 ZThread::ZThread(size_t stacksize)
 {
-  _initok = false;
+  _status = 0;
   _ssize = 0;
   _act = NULL;
@@ -82 +96 @@
 void ZThread::start()
 {
-  if (_initok) throw ZThreadExc("ZThread::Start() - Already started thread !");
+  if ( IfStarted() ) throw ZThreadExc("ZThread::Start() - Already started thread !");
   int rc;
   pthread_attr_t tha;
@@ -91 +105 @@
   rc = pthread_create(&_thr, &tha, zthr_run, this);
   CheckSt(rc,"ZThread::start() - Pb creating the thread object");     
-  _initok = true;
   setRC(rc);      
 }
@@ -100 +113 @@
 void ZThread::cancel()
 {
-  if (!_initok) throw ZThreadExc("ZThread::cancel() - thread not started !");
+  if ( !IfStarted() ) throw ZThreadExc("ZThread::cancel() - thread not started !");
   int rc = pthread_cancel(_thr);
   CheckSt(rc,"ZThread::cancel() - Pb pthread_cancel() ");  
@@ -111 +124 @@
 void ZThread::kill(int sig)
 {
-  if (!_initok) throw ZThreadExc("ZThread::kill() - thread not started !");
+  if ( !IfStarted() ) throw ZThreadExc("ZThread::kill() - thread not started !");
   int rc = pthread_kill(_thr, sig);
   CheckSt(rc,"ZThread::kill() - Pb pthread_kill() ");  
@@ -119 +132 @@
 
 /*!
-  Waits for the thread to terminate. 
+  \brief Waits for the thread to terminate (call pthread_join() )
 */
 void ZThread::join()
 {
-  if (!_initok) throw ZThreadExc("ZThread::join() - thread not started !");
+  if ( !IfStarted() ) throw ZThreadExc("ZThread::join() - thread not started !");
   void * x;
   int rc = pthread_join(_thr, &x);
@@ -131 +144 @@
 
 /*!
+  \brief Method which does the actual computation 
   This virtual method can be redefined in the derived class, in order 
-  to perform the actual computation.
+  to perform the actual computation. The default implementation call
+  the action function (if defined by setAction() )
+  
 */
 void ZThread::run()
@@ -139 +155 @@
   setRC(0);      
   return;
+}
+
+/*!
+  \brief Method called by the function passed to pthread_create().
+  This method sets the clean-up handler, changes the status variable
+  and call the run() method, and pthread_exit() at the end.
+*/
+void ZThread::run_p()
+{
+  _status = 1;
+  pthread_cleanup_push(zthr_cleanup, (void *)this);
+  run();
+  _status = 2;
+  pthread_exit(&(_rc));
+  pthread_cleanup_pop(0);
+  return;
+}
+
+
+void ZThread::ActivateExitOnSignal(int sig)
+{
+  struct sigaction ae, ad;
+
+  ae.sa_handler = zthr_sig_exit;
+  ad.sa_handler = SIG_DFL;
+  memset( &(ae.sa_mask), 0, sizeof(sigset_t) ); 
+  ae.sa_flags = 0;
+  memset( &(ad.sa_mask), 0, sizeof(sigset_t) ); 
+  ad.sa_flags = 0;
+#ifdef  OSF1
+  ae.sa_flags = SA_RESTART;
+  ad.sa_mask = 0;
+#endif
+  printf(" Activating signal %d  handling for threads -> pthread_exit()\n",sig);
+  sigaction(sig, &ae, NULL);
 }