X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=99b4c7df78ddfe2b48058726a5a3acc9ca18fd61;hp=380e53e0fbae30cf9c949afea6d247d71396eb37;hb=9bf4bc297a7cb88f4f886c6b8d600fd6c584139c;hpb=e62e55701ef07bfa9f5805718ceac2c54ead3dbc diff --git a/audiod.c b/audiod.c index 380e53e0..99b4c7df 100644 --- a/audiod.c +++ b/audiod.c @@ -983,16 +983,17 @@ static void signal_pre_select(struct sched *s, struct task *t) static void signal_post_select(struct sched *s, struct task *t) { struct signal_task *st = container_of(t, struct signal_task, task); + int signum; if (!FD_ISSET(st->fd, &s->rfds)) return; - st->signum = para_next_signal(); - switch (st->signum) { + signum = para_next_signal(); + switch (signum) { case SIGINT: case SIGTERM: case SIGHUP: - PARA_EMERG_LOG("terminating on signal %d\n", st->signum); + PARA_EMERG_LOG("terminating on signal %d\n", signum); clean_exit(EXIT_FAILURE, "caught deadly signal"); } } @@ -1023,9 +1024,7 @@ static void command_post_select(struct sched *s, struct task *t) last_status_dump = *now; } - if (!FD_ISSET(ct->fd, &s->rfds)) - return; - ret = handle_connect(ct->fd); + ret = handle_connect(ct->fd, &s->rfds); if (ret < 0) PARA_ERROR_LOG("%s\n", para_strerror(-ret)); audiod_status_dump();