X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=bc143039563b830b07164efd96ac76a4f6d3e267;hp=89a8137233c019df844f56d3a21bf841fd3fda15;hb=60ef885705932a682097ad2b9f2379282d814e79;hpb=6668ac4a8c7f2a92efb9e6d405d954beff77d230

diff --git a/server.c b/server.c
index 89a81372..bc143039 100644
--- a/server.c
+++ b/server.c
@@ -276,15 +276,13 @@ static void handle_sighup(void)
 		kill(mmd->afs_pid, SIGHUP);
 }
 
-static void signal_post_select(struct sched *s, struct task *t)
+static void signal_post_select(struct sched *s, __a_unused struct task *t)
 {
-	struct signal_task *st = container_of(t, struct signal_task, task);
+	int signum = para_next_signal(&s->rfds);
 
-	if (!FD_ISSET(st->fd, &s->rfds))
+	switch (signum) {
+	case 0:
 		return;
-
-	st->signum = para_next_signal();
-	switch (st->signum) {
 	case SIGHUP:
 		handle_sighup();
 		break;
@@ -304,7 +302,7 @@ static void signal_post_select(struct sched *s, struct task *t)
 	/* die on sigint/sigterm. Kill all children too. */
 	case SIGINT:
 	case SIGTERM:
-		PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+		PARA_EMERG_LOG("terminating on signal %d\n", signum);
 		kill(0, SIGTERM);
 		/*
 		 * We must wait for afs because afs catches SIGINT/SIGTERM.
@@ -366,12 +364,9 @@ static void command_post_select(struct sched *s, struct task *t)
 	pid_t child_pid;
 	uint32_t *chunk_table;
 
-	if (!FD_ISSET(sct->listen_fd, &s->rfds))
-		return;
-	ret = para_accept(sct->listen_fd, NULL, 0);
-	if (ret < 0)
+	ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd);
+	if (ret <= 0)
 		goto out;
-	new_fd = ret;
 	peer_name = remote_name(new_fd);
 	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;