X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=6de9adf817f1a7b1885133729cd741dcff72399f;hp=82444cc81b9c1ffa7248e701ad36cd606b8fc877;hb=e57d2b9211bb734b71838142a7936fe6dfdc449c;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623

diff --git a/signal.c b/signal.c
index 82444cc8..6de9adf8 100644
--- a/signal.c
+++ b/signal.c
@@ -18,16 +18,17 @@
 /** \file signal.c signal handling functions */
 
 #include "para.h"
+#include "fd.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 +42,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);
 }