X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=3da39f324b83b2a6d83d1f468732f74cc4313ae2;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=99a53b68e11ec6fa1e11d7bfe6f0319c07993d25;hpb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed;p=paraslash.git

diff --git a/afs.c b/afs.c
index 99a53b68..3da39f32 100644
--- a/afs.c
+++ b/afs.c
@@ -24,6 +24,7 @@
 #include "afs.h"
 #include "net.h"
 #include "server.h"
+#include "daemon.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"
@@ -707,7 +708,7 @@ static int open_afs_tables(void)
 	return ret;
 }
 
-static int afs_signal_post_select(struct sched *s, __a_unused void *context)
+static int afs_signal_post_monitor(struct sched *s, __a_unused void *context)
 {
 	int signum, ret;
 
@@ -743,8 +744,8 @@ static void register_signal_task(struct sched *s)
 
 	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
-		.pre_select = signal_pre_select,
-		.post_select = afs_signal_post_select,
+		.pre_monitor = signal_pre_monitor,
+		.post_monitor = afs_signal_post_monitor,
 		.context = signal_task,
 
 	}, s);
@@ -762,7 +763,7 @@ struct afs_client {
 	struct timeval connect_time;
 };
 
-static void command_pre_select(struct sched *s, void *context)
+static void command_pre_monitor(struct sched *s, void *context)
 {
 	struct command_task *ct = context;
 	struct afs_client *client;
@@ -917,7 +918,7 @@ err:
 /** Shutdown connection if query has not arrived until this many seconds. */
 #define AFS_CLIENT_TIMEOUT 3
 
-static int command_post_select(struct sched *s, void *context)
+static int command_post_monitor(struct sched *s, void *context)
 {
 	struct command_task *ct = context;
 	struct sockaddr_un unix_addr;
@@ -959,7 +960,7 @@ static int command_post_select(struct sched *s, void *context)
 		close(fd);
 		return 0;
 	}
-	client = para_malloc(sizeof(*client));
+	client = alloc(sizeof(*client));
 	client->fd = fd;
 	client->connect_time = *now;
 	para_list_add(&client->node, &afs_client_list);
@@ -973,12 +974,20 @@ static void register_command_task(struct sched *s)
 
 	ct->task = task_register(&(struct task_info) {
 		.name = "afs command",
-		.pre_select = command_pre_select,
-		.post_select = command_post_select,
+		.pre_monitor = command_pre_monitor,
+		.post_monitor = command_post_monitor,
 		.context = ct,
 	}, s);
 }
 
+static int afs_poll(struct pollfd *fds, nfds_t nfds, int timeout)
+{
+	mutex_lock(mmd_mutex);
+	daemon_set_loglevel(mmd->loglevel);
+	mutex_unlock(mmd_mutex);
+	return xpoll(fds, nfds, timeout);
+}
+
 /**
  * Initialize the audio file selector process.
  *
@@ -1004,6 +1013,7 @@ __noreturn void afs_init(int socket_fd)
 	init_admissible_files(OPT_STRING_VAL(AFS_INITIAL_MODE));
 	register_command_task(&s);
 	s.default_timeout = 1000;
+	s.poll_function = afs_poll;
 	ret = write(socket_fd, "\0", 1);
 	if (ret != 1) {
 		if (ret == 0)