X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=cc49da11f2b647c83cb068b0cecab439419eb571;hp=128f6bba90fd0a9fd3b1f80adf8731d685438af1;hb=50eb5f37e3da3036fb709cd7ab2825c8d827f42a;hpb=6751fdf54c240791298420b3034a32aa9cdc4200

diff --git a/signal.c b/signal.c
index 128f6bba..cc49da11 100644
--- a/signal.c
+++ b/signal.c
@@ -40,10 +40,10 @@ int para_signal_init(void)
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err_out;
 	}
-	ret = mark_fd_nonblock(signal_pipe[0]);
+	ret = mark_fd_nonblocking(signal_pipe[0]);
 	if (ret < 0)
 		goto err_out;
-	ret = mark_fd_nonblock(signal_pipe[1]);
+	ret = mark_fd_nonblocking(signal_pipe[1]);
 	if (ret < 0)
 		goto err_out;
 	return signal_pipe[0];
@@ -64,7 +64,7 @@ static void generic_signal_handler(int s)
 /**
  * Reap one child.
  *
- * \para, pid In case a child died, its pid is returned here.
+ * \param pid In case a child died, its pid is returned here.
  *
  * Call waitpid() and print a log message containing the pid and the cause of
  * the child's death.
@@ -85,13 +85,13 @@ int para_reap_child(pid_t *pid)
 	if (*pid < 0)
 		return -ERRNO_TO_PARA_ERROR(errno);
 	if (WIFEXITED(status))
-		PARA_DEBUG_LOG("child %i exited. Exit status: %i\n", *pid,
+		PARA_DEBUG_LOG("child %i exited. Exit status: %i\n", (int)*pid,
 			WEXITSTATUS(status));
 	else if (WIFSIGNALED(status))
-		PARA_DEBUG_LOG("child %i was killed by signal %i\n", *pid,
+		PARA_DEBUG_LOG("child %i was killed by signal %i\n", (int)*pid,
 			WTERMSIG(status));
 	else
-		PARA_WARNING_LOG("child %i terminated abormally\n", *pid);
+		PARA_WARNING_LOG("child %i terminated abormally\n", (int)*pid);
 	return 1;
 }
 
@@ -137,9 +137,18 @@ int para_next_signal(void)
 	int s;
 	ssize_t r;
 
-	if ((r = read(signal_pipe[0], &s, sizeof(s)) == sizeof(s)) > 0) {
+	r = read(signal_pipe[0], &s, sizeof(s));
+	if (r == sizeof(s)) {
 		PARA_DEBUG_LOG("next signal: %d\n", s);
 		return s;
 	}
 	return r < 0 && (errno != EAGAIN)? 0 : -E_SIGNAL_READ;
 }
+
+/**
+ * Close the signal pipe.
+ */
+void para_signal_shutdown(void)
+{
+	close(signal_pipe[1]);
+}