X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=6233e2d1aaee7d08260cf6e7dd9b92bf51f8fbcc;hb=9da3498d99e07ba38a205fa3833f1ec95bc7b33b;hp=fd705b1fa824013c702df97eefdce420bb02022f;hpb=479c7a84ce41333662c6307c523843262fa4cb69;p=paraslash.git diff --git a/afs.c b/afs.c index fd705b1f..6233e2d1 100644 --- a/afs.c +++ b/afs.c @@ -776,7 +776,7 @@ static void signal_pre_select(struct sched *s, struct task *t) para_fd_set(st->fd, &s->rfds, &s->max_fileno); } -static void signal_post_select(struct sched *s, struct task *t) +static void afs_signal_post_select(struct sched *s, struct task *t) { struct signal_task *st = container_of(t, struct signal_task, task); if (getppid() == 1) { @@ -809,10 +809,6 @@ static void register_signal_task(void) PARA_EMERG_LOG("failed to ignore SIGPIPE\n"); exit(EXIT_FAILURE); } - if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) { - PARA_EMERG_LOG("failed to ignore SIGUSR1\n"); - exit(EXIT_FAILURE); - } st->fd = para_signal_init(); PARA_INFO_LOG("signal pipe: fd %d\n", st->fd); para_install_sighandler(SIGINT); @@ -820,7 +816,7 @@ static void register_signal_task(void) para_install_sighandler(SIGHUP); st->task.pre_select = signal_pre_select; - st->task.post_select = signal_post_select; + st->task.post_select = afs_signal_post_select; sprintf(st->task.status, "signal task"); register_task(&st->task); }