Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash

[paraslash.git] / signal.c

diff --git a/signal.c b/signal.c
index 82444cc81b9c1ffa7248e701ad36cd606b8fc877..f9b95f9006dee9c9cd558bb39bc0cc6c90ca1bb1 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -17,17 +17,23 @@
  */
 /** \file signal.c signal handling functions */
 
+
+
 #include "para.h"
+#include "fd.h"
+
+#include <signal.h>
+
 #include "error.h"
 static int signal_pipe[2];
 
 /**
  * initialize the paraslash signal subsystem
  *
- * This function creates a pipe, the signal pipe, to deliver pending signals to
- * the application. It should be called during the application's startup part,
- * followed by subsequent calls to para_install_sighandler() for each signal
- * that should be caught.
+ * This function creates a pipe, the signal pipe, to deliver pending
+ * signals to the application (Bernstein's trick). It should be called
+ * during the application's startup part, followed by subsequent calls
+ * to para_install_sighandler() for each signal that should be caught.
  *
  * para_signal_init() installs a generic signal handler which is used for all
  * signals simultaneously. When a signal arrives, this generic signal handler
@@ -41,9 +47,18 @@ static int signal_pipe[2];
  */
 int para_signal_init(void)
 {
-       if (!pipe(signal_pipe))
-               return signal_pipe[0];
-       PARA_EMERG_LOG("%s", "pipe error: Can not setup signal pipe");
+       int ret = -E_SIGNAL_PIPE;
+       if (pipe(signal_pipe))
+               goto err_out;
+       ret = mark_fd_nonblock(signal_pipe[0]);
+       if (ret < 0)
+               goto err_out;
+       ret = mark_fd_nonblock(signal_pipe[1]);
+       if (ret < 0)
+               goto err_out;
+       return signal_pipe[0];
+err_out:
+       PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
        exit(EXIT_FAILURE);
 }
 
@@ -74,7 +89,7 @@ pid_t para_reap_child(void)
        if (pid <= 0) {
                if (pid < 0)
                        pid = -E_WAITPID;
-               return 0;
+               return pid;
        }
        if (WIFEXITED(status))
                PARA_DEBUG_LOG("child %i exited. Exit status: %i\n", pid,