X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=fc81b9440150f886af47b97ce77878f937959344;hp=1d67b8b8f503bcaad721371b01c3ef07c6dd7e81;hb=71929f2e901067bf1c8d9693ab27ef844d37b148;hpb=82ecf70328a16bedbbb555ca478c7b6b45af9621

diff --git a/server.c b/server.c
index 1d67b8b8..fc81b944 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -113,6 +113,19 @@ struct server_command_task {
 	struct task *task;
 };
 
+/**
+ * Return the list of tasks for the server process.
+ *
+ * This is called from \a com_tasks(). The helper is necessary since command
+ * handlers can not access the scheduler structure directly.
+ *
+ * \return A dynamically allocated string that must be freed by the caller.
+ */
+char *server_get_tasks(void)
+{
+	return get_task_list(&sched);
+}
+
 static int want_colors(void)
 {
 	if (conf.color_arg == color_arg_no)
@@ -235,9 +248,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 +266,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 +342,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;
@@ -483,14 +496,12 @@ static void server_init(int argc, char **argv)
 	version_handle_flag("server", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	drop_privileges_or_die(conf.user_arg, conf.group_arg);
+	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);
-	log_welcome("para_server");
+	daemon_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);
+	daemon_set_start_time();
 	init_user_list(user_list_file);
 	/* become daemon */
 	if (conf.daemon_given)
@@ -528,7 +539,7 @@ static void server_init(int argc, char **argv)
 static void status_refresh(void)
 {
 	static int prev_uptime = -1, prev_events = -1;
-	int uptime = get_server_uptime(now);
+	int uptime = daemon_get_uptime(now);
 
 	if (prev_events != mmd->events)
 		goto out;