poll PIDs for status information

3 files changed, 151 insertions, 14 deletions

diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 4417a68a0..9c302d1de 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -549,7 +549,6 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct ServiceList *pos;
   pid_t pid;
-  int status;
   const char *statstr;
   int statcode;
   struct stat sbuf;
@@ -562,7 +561,7 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
           running = pos->next;
           if (0 != PLIBC_KILL (pos->pid, SIGTERM))
             GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
-          if (pos->pid != waitpid (pos->pid, NULL, 0))
+          if (GNUNET_OK != GNUNET_OS_process_wait(pos->pid))
             GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
           free_entry (pos);
         }
@@ -575,25 +574,28 @@ maint (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                                 MAINT_FREQUENCY, &maint, cfg);
 
   /* check for services that died (WAITPID) */
-  while (0 < (pid = waitpid (0, &status, WNOHANG)))
+  for (pos = running; pos != NULL; pos = pos->next)
     {
-      if (WIFSTOPPED (status) || WIFCONTINUED (status))
+      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");
         continue;
-      pos = find_pid (pid);
-      if (pos == NULL)
-        {
-          /* we killed the service */
-          continue;
-        }
-      if (WIFEXITED (status))
+      }
+
+      if (statusType == GNUNET_OS_PROCESS_STOPPED || statusType == GNUNET_OS_PROCESS_RUNNING)
+        continue;
+      else if (statusType == GNUNET_OS_PROCESS_EXITED)
         {
           statstr = _( /* process termination method */ "exit");
-          statcode = WEXITSTATUS (status);
+          statcode = statusCode;
         }
-      else if (WTERMSIG (status))
+      else if (statusType == GNUNET_OS_PROCESS_SIGNALED)
         {
           statstr = _( /* process termination method */ "signal");
-          statcode = WTERMSIG (status);
+          statcode = statusCode;
         }
       else
         {
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index dfab4a747..8e48a049c 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -60,6 +60,19 @@ enum GNUNET_OS_InstallationPathKind
 
 
 /**
+ * Process status types
+ */
+enum GNUNET_OS_ProcessStatusType
+{
+  GNUNET_OS_PROCESS_UNKNOWN,
+  GNUNET_OS_PROCESS_RUNNING,
+  GNUNET_OS_PROCESS_STOPPED,
+  GNUNET_OS_PROCESS_EXITED,
+  GNUNET_OS_PROCESS_SIGNALED
+};
+
+
+/**
  * Get the path to a specific GNUnet installation directory or, with
  * GNUNET_OS_IPK_SELF_PREFIX, the current running apps installation
  * directory.
@@ -145,6 +158,23 @@ pid_t GNUNET_OS_start_process (const char *filename, ...);
  */
 pid_t GNUNET_OS_start_process_v (const char *filename, char *const argv[]);
 
+/**
+ * Retrieve the status of a process
+ * @param proc process ID
+ * @param type status type
+ * @param code return code/signal number
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
+    unsigned long *code);
+
+/**
+ * Wait for a process
+ * @param proc process ID to wait for
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int GNUNET_OS_process_wait (pid_t proc);
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index f74bd9266..c017a1e38 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -257,9 +257,114 @@ GNUNET_OS_start_process_v (const char *filename, char *const argv[])
 #endif
 }
 
+/**
+ * Retrieve the status of a process
+ * @param proc process ID
+ * @param type status type
+ * @param code return code/signal number
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
+GNUNET_OS_process_status (pid_t proc, enum GNUNET_OS_ProcessStatusType *type,
+    unsigned long *code)
+{
+#ifndef MINGW
+  int status;
+
+  if (proc != waitpid (0, &status, WNOHANG))
+    return GNUNET_SYSERR;
+  if (WIFEXITED (status))
+  {
+    *type = GNUNET_OS_PROCESS_EXITED;
+    *code = WEXITSTATUS (status);
+  }
+  else if (WIFSIGNALED (status))
+  {
+    *type = GNUNET_OS_PROCESS_SIGNALED;
+    *code = WTERMSIG (status);
+  }
+  else if (WIFSTOPPED (status))
+  {
+    *type = GNUNET_OS_PROCESS_SIGNALED;
+    *code = WSTOPSIG (status);
+  }
+  else if (WIFCONTINUED (status))
+  {
+    *type = GNUNET_OS_PROCESS_RUNNING;
+    *code = 0;
+  }
+  else
+  {
+    *type = GNUNET_OS_PROCESS_UNKNOWN;
+    *code = 0;
+  }
+#else
+  HANDLE h;
+  DWORD c;
+
+  h = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, proc);
+  if (INVALID_HANDLE_VALUE == h)
+  {
+    SetErrnoFromWinError (GetLastError ());
+    return GNUNET_SYSERR;
+  }
+
+  c = GetExitCodeProcess (proc, &c);
+  if (STILL_ACTIVE == c)
+  {
+    *type = GNUNET_OS_PROCESS_RUNNING;
+    *code = 0;
+  }
+  else
+  {
+    *type = GNUNET_OS_PROCESS_EXITED;
+    *code = c;
+  }
+
+  CloseHandle (h);
+#endif
+
+  return GNUNET_OK;
+}
+
+/**
+ * Wait for a process
+ * @param proc process ID to wait for
+ * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ */
+int
+GNUNET_OS_process_wait (pid_t proc)
+{
+#ifndef MINGW
+  if (proc != waitpid (proc, NULL, 0))
+    return GNUNET_SYSERR;
 
+  return GNUNET_OK;
+#else
+  HANDLE h;
+  DWORD c;
+  int ret;
 
+  h = OpenProcess (PROCESS_QUERY_INFORMATION, FALSE, proc);
+  if (INVALID_HANDLE_VALUE == h)
+  {
+    SetErrnoFromWinError (GetLastError ());
+    return GNUNET_SYSERR;
+  }
 
+  if (WAIT_OBJECT_0 != WaitForSingleObject (h, INFINITE))
+  {
+    SetErrnoFromWinError (GetLastError ());
+    ret = GNUNET_SYSERR;
+  }
+  else
+    ret = GNUNET_OK;
+
+  CloseHandle (h);
+
+  return ret;
+#endif
+}
 
 
 /* end of os_priority.c */