X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=inline;f=server.c;h=5da384d8a935f9e02f830b7aadf079c2701145fe;hb=e3a7e12639c34fd86d48a072beb48add8c498d09;hp=ce4ebf34ee680a4e24b9305879ef1b7ea248ba7e;hpb=ad37397a4f7734394ef1f03b4b54a54226421a4e;p=paraslash.git

diff --git a/server.c b/server.c
index ce4ebf34..5da384d8 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"
@@ -250,7 +250,7 @@ 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;
 
@@ -313,20 +313,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,
@@ -383,7 +383,7 @@ 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.
 	 *
@@ -399,7 +399,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;
@@ -459,8 +459,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);
 	/*