X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=fc81b9440150f886af47b97ce77878f937959344;hp=fa19ce4225111e33ec7f192935f455c6cd5b2d76;hb=1f7a50b57bf59a85dafaed5e7b48bb0ec2efcc5c;hpb=a731a7c6e78fb137268b42062d9fb08b4e49a2c8

diff --git a/server.c b/server.c
index fa19ce42..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.
  */
@@ -110,9 +110,22 @@ struct server_command_task {
 	/** Argument vector passed to para_server's main function. */
 	char **argv;
 	/** The command task structure for scheduling. */
-	struct task 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 = container_of(t, struct signal_task, task);
+	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);
 
@@ -312,10 +325,6 @@ static void init_signal_task(void)
 	static struct signal_task signal_task_struct,
 		*st = &signal_task_struct;
 
-	st->task.pre_select = signal_pre_select;
-	st->task.post_select = signal_post_select;
-	sprintf(st->task.status, "signal task");
-
 	PARA_NOTICE_LOG("setting up signal handling\n");
 	st->fd = para_signal_init(); /* always successful */
 	para_install_sighandler(SIGINT);
@@ -324,18 +333,24 @@ static void init_signal_task(void)
 	para_install_sighandler(SIGCHLD);
 	para_sigaction(SIGPIPE, SIG_IGN);
 	add_close_on_fork_list(st->fd);
-	register_task(&sched, &st->task);
+	st->task = task_register(&(struct task_info) {
+		.name = "signal",
+		.pre_select = signal_pre_select,
+		.post_select = signal_post_select,
+		.context = st,
+
+	}, &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 = container_of(t, struct server_command_task, task);
+	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 = container_of(t, struct server_command_task, task);
+	struct server_command_task *sct = context;
 
 	int new_fd, ret, i;
 	char *peer_name;
@@ -399,8 +414,6 @@ static void init_server_command_task(int argc, char **argv)
 		*sct = &server_command_task_struct;
 
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
-	sct->task.pre_select = command_pre_select;
-	sct->task.post_select = command_post_select;
 	sct->argc = argc;
 	sct->argv = argv;
 	ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);
@@ -411,8 +424,12 @@ static void init_server_command_task(int argc, char **argv)
 	if (ret < 0)
 		goto err;
 	add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
-	sprintf(sct->task.status, "server command task");
-	register_task(&sched, &sct->task);
+	sct->task = task_register(&(struct task_info) {
+		.name = "server command",
+		.pre_select = command_pre_select,
+		.post_select = command_post_select,
+		.context = sct,
+	}, &sched);
 	return;
 err:
 	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
@@ -479,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)
@@ -524,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;
@@ -573,6 +588,7 @@ int main(int argc, char *argv[])
 	server_init(argc, argv);
 	mutex_lock(mmd_mutex);
 	ret = schedule(&sched);
+	sched_shutdown(&sched);
 	if (ret < 0) {
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);