X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=0b4b6f0b847171e3c68311c4075c2d26f017a5b3;hp=59a0d45aba7ad975fc287862308891435c4e9095;hb=8d00849555d99c5434610753ad0e4cc93fb7bb64;hpb=343f3c63fc3a7f9ca4ba4163c9e4cf06cde8d0c3

diff --git a/signal.c b/signal.c
index 59a0d45a..0b4b6f0b 100644
--- a/signal.c
+++ b/signal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2004-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -102,20 +102,6 @@ int para_reap_child(pid_t *pid)
 	return 1;
 }
 
-/**
- * Paraslash's zombie killer.
- *
- * It just calls \p para_reap_child() until there are no more children left to
- * reap.
- */
-void para_reap_children(void)
-{
-	pid_t pid;
-
-	while (para_reap_child(&pid) > 0)
-		; /* nothing */
-}
-
 /**
  * Install the given handler for the given signal.
  *
@@ -163,29 +149,26 @@ void para_install_sighandler(int sig)
 }
 
 /**
- * Return the number of next pending signal.
+ * Return the number of the next pending signal.
  *
- * This should be called if the fd for the signal pipe is ready for reading.
+ * \param rfds Th fd_set containing the signal pipe.
  *
- * \return On success, the number of the received signal is returned.  If the
- * read returned zero or was interrupted by another signal the function returns
- * 0.  Otherwise, a negative error value is returned.
+ * \return On success, the number of the received signal is returned. If there
+ * is no signal currently pending, the function returns zero. On read errors
+ * from the signal pipe, the process is terminated.
  */
-int para_next_signal(void)
+int para_next_signal(fd_set *rfds)
 {
-	int s;
-	ssize_t r = read(signal_pipe[0], &s, sizeof(s));
+	size_t n;
+	int s, ret = read_nonblock(signal_pipe[0], &s, sizeof(s), rfds, &n);
 
-	if (!r) {
-		PARA_CRIT_LOG("read from signal pipe returned zero\n");
-		return 0;
+	if (ret < 0) {
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		exit(EXIT_FAILURE);
 	}
-	if (r < 0) {
-		if (errno == EAGAIN || errno == EINTR)
-			return 0;
-		return -ERRNO_TO_PARA_ERROR(errno);
-	}
-	assert(r == sizeof(s));
+	if (n == 0)
+		return 0;
+	assert(n == sizeof(s));
 	PARA_DEBUG_LOG("next signal: %d\n", s);
 	return s;
 }