X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=2852ee1f10f7a9d8d4f5a93e2233b8b6fd4a4ecc;hp=e0df714be975b083f4d3cc7116ad0af2501a2b46;hb=HEAD;hpb=018a7b7927b76044b28eece39039cb2f5ea9c192

diff --git a/server.c b/server.c
index e0df714b..ea9cc9c0 100644
--- a/server.c
+++ b/server.c
@@ -24,8 +24,8 @@
 #include "net.h"
 #include "server.h"
 #include "list.h"
-#include "send.h"
 #include "sched.h"
+#include "send.h"
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
@@ -172,6 +172,7 @@ static void init_ipc_or_die(void)
 	mmd->active_connections = 0;
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
+	mmd->loglevel = OPT_UINT32_VAL(LOGLEVEL);
 	return;
 destroy_mmd_mutex:
 	mutex_destroy(mmd_mutex);
@@ -180,6 +181,9 @@ err_out:
 	exit(EXIT_FAILURE);
 }
 
+/** Get a reference to the supercommand of para_server. */
+#define CMD_PTR (lls_cmd(0, server_suite))
+
 /**
  * (Re-)read the server configuration files.
  *
@@ -205,7 +209,7 @@ void parse_config_or_die(bool reload)
 			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	if (OPT_GIVEN(LOGFILE)) {
 		daemon_set_logfile(OPT_STRING_VAL(LOGFILE));
 		daemon_open_log_or_die();
@@ -250,14 +254,14 @@ static void handle_sighup(void)
 		kill(afs_pid, SIGHUP);
 }
 
-static int signal_post_select(struct sched *s, __a_unused void *context)
+static int signal_post_monitor(struct sched *s, __a_unused void *context)
 {
 	int ret, signum;
 
 	ret = task_get_notification(signal_task->task);
 	if (ret < 0)
 		return ret;
-	signum = para_next_signal(&s->rfds);
+	signum = para_next_signal();
 	switch (signum) {
 	case 0:
 		return 0;
@@ -313,20 +317,20 @@ static void init_signal_task(void)
 	add_close_on_fork_list(signal_task->fd);
 	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
-		.pre_select = signal_pre_select,
-		.post_select = signal_post_select,
+		.pre_monitor = signal_pre_monitor,
+		.post_monitor = signal_post_monitor,
 		.context = signal_task,
 
 	}, &sched);
 }
 
-static void command_pre_select(struct sched *s, void *context)
+static void command_pre_monitor(struct sched *s, void *context)
 {
 	unsigned n;
 	struct server_command_task *sct = context;
 
 	for (n = 0; n < sct->num_listen_fds; n++)
-		para_fd_set(sct->listen_fds[n], &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(sct->listen_fds[n], s);
 }
 
 static int command_task_accept(unsigned listen_idx, struct sched *s,
@@ -337,7 +341,7 @@ static int command_task_accept(unsigned listen_idx, struct sched *s,
 	pid_t child_pid;
 	uint32_t *chunk_table;
 
-	ret = para_accept(sct->listen_fds[listen_idx], &s->rfds, NULL, 0, &new_fd);
+	ret = para_accept(sct->listen_fds[listen_idx], NULL, 0, &new_fd);
 	if (ret <= 0)
 		goto out;
 	mmd->num_connects++;
@@ -383,13 +387,13 @@ static int command_task_accept(unsigned listen_idx, struct sched *s,
 	/*
 	 * After we return, the scheduler calls server_select() with a minimal
 	 * timeout value, because the remaining tasks have a notification
-	 * pending. Next it calls the ->post_select method of these tasks,
+	 * pending. Next it calls the ->post_monitor method of these tasks,
 	 * which will return negative in view of the notification. This causes
 	 * schedule() to return as there are no more runnable tasks.
 	 *
 	 * Note that semaphores are not inherited across a fork(), so we don't
-	 * hold the lock at this point. Since server_select() drops the lock
-	 * prior to calling para_select(), we need to acquire it here.
+	 * hold the lock at this point. Since server_poll() drops the lock
+	 * prior to calling poll(), we need to acquire it here.
 	 */
 	mutex_lock(mmd_mutex);
 	return -E_CHILD_CONTEXT;
@@ -399,7 +403,7 @@ out:
 	return 0;
 }
 
-static int command_post_select(struct sched *s, void *context)
+static int command_post_monitor(struct sched *s, void *context)
 {
 	struct server_command_task *sct = context;
 	unsigned n;
@@ -432,14 +436,14 @@ static void init_server_command_task(struct server_command_task *sct,
 	sct->argv = argv;
 	if (!OPT_GIVEN(LISTEN_ADDRESS)) {
 		sct->num_listen_fds = 1;
-		sct->listen_fds = para_malloc(sizeof(int));
+		sct->listen_fds = alloc(sizeof(int));
 		ret = para_listen_simple(IPPROTO_TCP, port);
 		if (ret < 0)
 			goto err;
 		sct->listen_fds[0] = ret;
 	} else {
 		sct->num_listen_fds = OPT_GIVEN(LISTEN_ADDRESS);
-		sct->listen_fds = para_malloc(sct->num_listen_fds * sizeof(int));
+		sct->listen_fds = alloc(sct->num_listen_fds * sizeof(int));
 		for (n = 0; n < OPT_GIVEN(LISTEN_ADDRESS); n++) {
 			const char *arg;
 			arg = lls_string_val(n, OPT_RESULT(LISTEN_ADDRESS));
@@ -459,8 +463,8 @@ static void init_server_command_task(struct server_command_task *sct,
 
 	sct->task = task_register(&(struct task_info) {
 		.name = "server command",
-		.pre_select = command_pre_select,
-		.post_select = command_post_select,
+		.pre_monitor = command_pre_monitor,
+		.post_monitor = command_post_monitor,
 		.context = sct,
 	}, &sched);
 	/*
@@ -543,7 +547,7 @@ static void server_init(int argc, char **argv, struct server_command_task *sct)
 	if (ret < 0)
 		goto fail;
 	server_lpr = cmdline_lpr;
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	daemon_drop_privileges_or_die(OPT_STRING_VAL(USER),
 		OPT_STRING_VAL(GROUP));
 	version_handle_flag("server", OPT_GIVEN(VERSION));
@@ -617,14 +621,14 @@ out:
 	killpg(0, SIGUSR1);
 }
 
-static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,
-		struct timeval *timeout_tv)
+static int server_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
 	int ret;
 
+	daemon_set_loglevel(mmd->loglevel);
 	status_refresh();
 	mutex_unlock(mmd_mutex);
-	ret = para_select(max_fileno + 1, readfds, writefds, timeout_tv);
+	ret = xpoll(fds, nfds, timeout);
 	mutex_lock(mmd_mutex);
 	return ret;
 }
@@ -658,15 +662,15 @@ int main(int argc, char *argv[])
 	struct server_command_task server_command_task_struct,
 		*sct = &server_command_task_struct;
 
-	sched.default_timeout.tv_sec = 1;
-	sched.select_function = server_select;
+	sched.default_timeout = 1000;
+	sched.poll_function = server_poll;
 
 	server_init(argc, argv, sct);
 	mutex_lock(mmd_mutex);
 	ret = schedule(&sched);
 	/*
-	 * We hold the mmd lock: it was re-acquired in server_select()
-	 * after the select call.
+	 * We hold the mmd lock: it was re-acquired in server_poll()
+	 * after the poll(2) call.
 	 */
 	mutex_unlock(mmd_mutex);
 	sched_shutdown(&sched);