X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=signal.h;h=e5532ded5a9378619f7951708b49c5b38bf52d18;hp=685654d5aae87f64e8d02823521984d1291133f7;hb=23dd2200dd4fc74025ae87f5c2127f3b0ff71e9b;hpb=a7f31bd369e5eda15361bef5aee2529bdb6eb89e

diff --git a/signal.h b/signal.h
index 685654d5..e5532ded 100644
--- a/signal.h
+++ b/signal.h
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file signal.h exported symbols from signal.c */
 
@@ -12,16 +8,37 @@
 struct signal_task {
 	/** The signal pipe. */
 	int fd;
-	/** The number of the most recent signal. */
-	int signum;
 	/** The associated task structure. */
-	struct task task;
+	struct task *task;
 };
 
-int para_signal_init(void);
+/**
+ * A generic pre-select method for signal tasks.
+ *
+ * \param s Passed to para_fd_set().
+ * \param context Signal task pointer.
+ *
+ * This convenience helper is called from several programs which need to handle
+ * signals, including para_server and para_audiod. These programs define a
+ * signal task structure and set its ->pre_select method to this function which
+ * adds the file descriptor of the signal task to the set of descriptors to be
+ * watched in the next select() call.
+ *
+ * Although the second parameter must be in fact a pointer to a signal_task
+ * structure, the parameter is specified as void * here to match the
+ * ->pre_select method of struct task.
+ */
+_static_inline_ void signal_pre_select(struct sched *s, void *context)
+{
+	struct signal_task *st = context;
+	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
+}
+
+struct signal_task *signal_init_or_die(void);
 void para_sigaction(int sig, void (*handler)(int));
 void para_install_sighandler(int);
-void para_reap_children(void);
 int para_reap_child(pid_t *pid);
-int para_next_signal(void);
-void para_signal_shutdown(void);
+int para_next_signal(fd_set *rfds);
+void signal_shutdown(struct signal_task *st);
+void para_block_signal(int sig);
+void para_unblock_signal(int sig);