X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.c;h=5d6e6e45dcd8e728c1bfcc6e08899bf08d4fc512;hp=68db5df7d95cf52e6cd179ee3f4f59a02a204666;hb=e0e0da08c77df028c261e27f3ab0b6250fbaa3bc;hpb=36ec2a43a7d9c085f16544e282a439cdbaec1e00

diff --git a/signal.c b/signal.c
index 68db5df7..5d6e6e45 100644
--- a/signal.c
+++ b/signal.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2004 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,11 +7,13 @@
 
 #include <signal.h>
 #include <sys/types.h>
+#include <regex.h>
 
 #include "para.h"
 #include "error.h"
 #include "fd.h"
 #include "list.h"
+#include "string.h"
 #include "sched.h"
 #include "signal.h"
 
@@ -32,12 +34,14 @@ static int signal_pipe[2];
  * ready for reading, see select(2).
  *
  * \return This function either succeeds or calls exit(2) to terminate the
- * current process. On success, the file descriptor of the read end of the
- * signal pipe is returned.
+ * current process. On success, a signal task structure is returned.
  */
-int para_signal_init(void)
+struct signal_task *signal_init_or_die(void)
 {
+	struct signal_task *st;
 	int ret;
+
+	PARA_NOTICE_LOG("setting up signal handling\n");
 	if (pipe(signal_pipe) < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
 		goto err_out;
@@ -48,7 +52,9 @@ int para_signal_init(void)
 	ret = mark_fd_nonblocking(signal_pipe[1]);
 	if (ret < 0)
 		goto err_out;
-	return signal_pipe[0];
+	st = para_calloc(sizeof(*st));
+	st->fd = signal_pipe[0];
+	return st;
 err_out:
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
@@ -223,9 +229,12 @@ int para_next_signal(fd_set *rfds)
 }
 
 /**
- * Close the write end of the signal pipe.
+ * Close the write end of the signal pipe, deallocate resources.
+ *
+ * \param st The pointer obtained earlier from signal_init_or_die().
  */
-void para_signal_shutdown(void)
+void signal_shutdown(struct signal_task *st)
 {
 	close(signal_pipe[1]);
+	free(st);
 }