fixing pid issues

3 files changed, 28 insertions, 17 deletions

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 9643273cf..3a93c654b 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -529,6 +529,7 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   const char *statstr;
   int statcode;
   struct stat sbuf;
+  int ret;
 
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     {
@@ -556,15 +557,13 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
       enum GNUNET_OS_ProcessStatusType statusType;
       unsigned long statusCode;
 
-      if (GNUNET_OS_process_status(pos->pid, &statusType, &statusCode) != GNUNET_OK)
-      {
-        GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR, "GNUNET_OS_process_status");
+      if (GNUNET_SYSERR == (ret = GNUNET_OS_process_status(pos->pid, &statusType, &statusCode)))
         continue;
-      }
-
-      if (statusType == GNUNET_OS_PROCESS_STOPPED || statusType == GNUNET_OS_PROCESS_RUNNING)
+      if ( (ret == GNUNET_NO) ||
+           (statusType == GNUNET_OS_PROCESS_STOPPED) || 
+           (statusType == GNUNET_OS_PROCESS_RUNNING) )
         continue;
-      else if (statusType == GNUNET_OS_PROCESS_EXITED)
+      if (statusType == GNUNET_OS_PROCESS_EXITED)
         {
           statstr = _( /* process termination method */ "exit");
           statcode = statusCode;
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 8e48a049c..1d4d47441 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -163,7 +163,7 @@ pid_t GNUNET_OS_start_process_v (const char *filename, char *const argv[]);
  * @param proc process ID
  * @param type status type
  * @param code return code/signal number
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return GNUNET_OK on success, GNUNET_NO if the process is still running, GNUNET_SYSERR otherwise
  */
 int GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
     unsigned long *code);
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index c017a1e38..0dfc9cafe 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -262,7 +262,7 @@ GNUNET_OS_start_process_v (const char *filename, char *const argv[])
  * @param proc process ID
  * @param type status type
  * @param code return code/signal number
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return GNUNET_OK on success, GNUNET_NO if the process is still running, GNUNET_SYSERR otherwise
  */
 int
 GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
@@ -270,9 +270,22 @@ GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
 {
 #ifndef MINGW
   int status;
+  int ret;
 
-  if (proc != waitpid (0, &status, WNOHANG))
-    return GNUNET_SYSERR;
+  ret = waitpid (0, &status, WNOHANG);
+  if ( (0 == ret) ||
+       ( (-1 == ret) &&
+         (ECHILD == errno) ) )
+    {
+      *type = GNUNET_OS_PROCESS_RUNNING;
+      *code = 0;
+      return GNUNET_NO;
+    }
+  if (proc != ret)
+    {
+      GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
+      return GNUNET_SYSERR;
+    }
   if (WIFEXITED (status))
   {
     *type = GNUNET_OS_PROCESS_EXITED;
@@ -306,6 +319,7 @@ GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
   if (INVALID_HANDLE_VALUE == h)
   {
     SetErrnoFromWinError (GetLastError ());
+    GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "OpenProcess");
     return GNUNET_SYSERR;
   }
 
@@ -314,13 +328,11 @@ GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
   {
     *type = GNUNET_OS_PROCESS_RUNNING;
     *code = 0;
+    CloseHandle (h);
+    return GNUNET_NO;
   }
-  else
-  {
-    *type = GNUNET_OS_PROCESS_EXITED;
-    *code = c;
-  }
-
+  *type = GNUNET_OS_PROCESS_EXITED;
+  *code = c;
   CloseHandle (h);
 #endif