X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=e963da7760465af02bcceec58730be2be4be84fd;hb=74c88020bd325865fe26ed25ea8ad0ace0924136;hp=07440003edf6f5d9b356026234f0bee72c091db4;hpb=a6dabdc1cd561d1ff38243c9457db47dce60d488;p=paraslash.git diff --git a/server.c b/server.c index 07440003..e963da77 100644 --- a/server.c +++ b/server.c @@ -278,13 +278,13 @@ static void handle_sighup(void) kill(mmd->afs_pid, SIGHUP); } -static void signal_post_select(struct sched *s, __a_unused struct task *t) +static int signal_post_select(struct sched *s, __a_unused struct task *t) { int signum = para_next_signal(&s->rfds); switch (signum) { case 0: - return; + return 0; case SIGHUP: handle_sighup(); break; @@ -329,6 +329,7 @@ cleanup: shm_detach(mmd); exit(EXIT_FAILURE); } + return 0; } static void init_signal_task(void) @@ -337,7 +338,7 @@ static void init_signal_task(void) *st = &signal_task_struct; st->task.pre_select = signal_pre_select; - st->task.post_select = signal_post_select; + st->task.new_post_select = signal_post_select; sprintf(st->task.status, "signal task"); PARA_NOTICE_LOG("setting up signal handling\n"); @@ -422,7 +423,6 @@ static void init_server_command_task(int argc, char **argv) PARA_NOTICE_LOG("initializing tcp command socket\n"); sct->task.pre_select = command_pre_select; sct->task.new_post_select = command_post_select; - sct->task.post_select = NULL; sct->argc = argc; sct->argv = argv; ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);