Changeset 398 for trunk/src

Timestamp:

Mar 27, 2012, 9:57:35 PM (13 years ago)

Author:

katerina

Message:

Fix for ticket #295 (Deadlock if sh_processes_readps hangs).

File:

• trunk/src/sh_processcheck.c (modified) (6 diffs)

trunk/src/sh_processcheck.c

@@ -864 +864 @@
 {
   int  cc; 
-  unsigned int  lnum   = 0;
-  unsigned long num    = 0;
+  volatile unsigned int  lnum   = 0;
+  volatile unsigned long num    = 0;
   char c;
   unsigned int  pos = 0;
@@ -907 +907 @@
               char errbuf[SH_ERRBUF_SIZE];
 
-              /* SH_MUTEX_LOCK(mutex_thread_nolog) is in caller */
+              SH_MUTEX_LOCK(mutex_thread_nolog);
               sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, errno, MSG_E_SUBGEN,
                               sh_error_message(errno, errbuf, sizeof(errbuf)),
                               _("sh_processes_readps"));
+              SH_MUTEX_UNLOCK(mutex_thread_nolog);
               break;
             }
@@ -930 +931 @@
               if (flag_err_debug == SL_TRUE)
                 {
-                  /* SH_MUTEX_LOCK(mutex_thread_nolog) is in caller */
+                  SH_MUTEX_LOCK(mutex_thread_nolog);
                   sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, num, 
                                   MSG_E_SUBGEN,
                                   tstr,
                                   _("sh_processes_readps"));
+                  SH_MUTEX_UNLOCK(mutex_thread_nolog);
                 }
               /* fprintf(stderr, "<%ld> %s\n", num, tstr); */
@@ -1078 +1080 @@
   if (status != 0)
     {
-      /* SH_MUTEX_LOCK(mutex_thread_nolog) is in caller */
+      SH_MUTEX_LOCK(mutex_thread_nolog);
       sh_error_handle(SH_ERR_ALL, FIL__, __LINE__, status, MSG_E_SUBGEN, 
                       _("Could not open pipe"), _("sh_processes_runps"));
+      SH_MUTEX_UNLOCK(mutex_thread_nolog);
       SL_RETURN ((-1), _("sh_processes_runps"));
     }
@@ -1161 +1164 @@
     }
 
-  SH_MUTEX_LOCK(mutex_thread_nolog);
   retval = sh_processes_runps (res, NULL, 0, SH_PR_PS, 0);
-  SH_MUTEX_UNLOCK(mutex_thread_nolog);
+
   for (i = sh_prochk_minpid; i != sh_prochk_maxpid; ++i)
     {
@@ -1169 +1171 @@
       res[j] = sh_processes_check ((pid_t) i, res[j]);
     }
-  SH_MUTEX_LOCK(mutex_thread_nolog);
+
   retval += sh_processes_runps (res, NULL, 0, SH_PR_PS2, 0);
-  SH_MUTEX_UNLOCK(mutex_thread_nolog);
 
   if (retval != 0)