X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=908e039b1cf66be5909b102edfb20aa83ceb2b2a;hp=1d67b8b8f503bcaad721371b01c3ef07c6dd7e81;hb=093dda1824631372587d107d64601389027c6187;hpb=82ecf70328a16bedbbb555ca478c7b6b45af9621;ds=sidebyside diff --git a/server.c b/server.c index 1d67b8b8..908e039b 100644 --- a/server.c +++ b/server.c @@ -235,9 +235,9 @@ out: exit(EXIT_FAILURE); } -static void signal_pre_select(struct sched *s, struct task *t) +static void signal_pre_select(struct sched *s, void *context) { - struct signal_task *st = task_context(t); + struct signal_task *st = context; para_fd_set(st->fd, &s->rfds, &s->max_fileno); } @@ -253,7 +253,7 @@ static void handle_sighup(void) kill(mmd->afs_pid, SIGHUP); } -static int signal_post_select(struct sched *s, __a_unused struct task *t) +static int signal_post_select(struct sched *s, __a_unused void *context) { int signum = para_next_signal(&s->rfds); @@ -329,15 +329,15 @@ static void init_signal_task(void) }, &sched); } -static void command_pre_select(struct sched *s, struct task *t) +static void command_pre_select(struct sched *s, void *context) { - struct server_command_task *sct = task_context(t); + struct server_command_task *sct = context; para_fd_set(sct->listen_fd, &s->rfds, &s->max_fileno); } -static int command_post_select(struct sched *s, struct task *t) +static int command_post_select(struct sched *s, void *context) { - struct server_command_task *sct = task_context(t); + struct server_command_task *sct = context; int new_fd, ret, i; char *peer_name; @@ -488,9 +488,7 @@ static void server_init(int argc, char **argv) parse_config_or_die(0); log_welcome("para_server"); init_ipc_or_die(); /* init mmd struct and mmd->lock */ - /* make sure, the global now pointer is uptodate */ - clock_get_realtime(now); - set_server_start_time(now); + set_server_start_time(NULL); init_user_list(user_list_file); /* become daemon */ if (conf.daemon_given)