X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=65d6ed958d17d3238c5b55535bf661ec782d5c5f;hp=135888a7fc632e6760d2aba4e1b4b2b4738af618;hb=fdbdd1fd575d7d37d4fb182252107a4d3816853c;hpb=6a79f16de242c0c70ef56bbd96a748055df65917

diff --git a/afs.c b/afs.c
index 135888a7..65d6ed95 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -81,7 +81,7 @@ struct command_task {
 	 */
 	uint32_t cookie;
 	/** The associated task structure. */
-	struct task task;
+	struct task *task;
 };
 
 extern int mmd_mutex;
@@ -292,10 +292,10 @@ out:
  * \param result_handler See \ref send_callback_request.
  * \param private_result_data See \ref send_callback_request.
  *
- * Some commands have a couple of options that are parsed in child context for
- * syntactic correctness and are stored in a special options structure for that
- * command. This function allows to pass such a structure together with a list
- * of further arguments (often a list of audio files) to the parent process.
+ * Some command handlers pass command-specific options to a callback, together
+ * with a list of further arguments (often a list of audio files). This
+ * function allows to pass an arbitrary structure (given as an osl object) and
+ * a usual argument vector to the specified callback.
  *
  * \return The return value of the underlying call to \ref
  * send_callback_request().
@@ -637,25 +637,19 @@ static int setup_command_socket_or_die(void)
 {
 	int ret, socket_fd;
 	char *socket_name = conf.afs_socket_arg;
-	struct sockaddr_un unix_addr;
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, &unix_addr,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
-		exit(EXIT_FAILURE);
+		ret = create_local_socket(socket_name,
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
+				socket_name);
+			exit(EXIT_FAILURE);
+		}
 	}
 	socket_fd = ret;
-	if (listen(socket_fd , 5) < 0) {
-		PARA_EMERG_LOG("can not listen on socket\n");
-		exit(EXIT_FAILURE);
-	}
-	ret = mark_fd_nonblocking(socket_fd);
-	if (ret < 0) {
-		close(socket_fd);
-		return ret;
-	}
 	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name,
 		socket_fd);
 	return socket_fd;
@@ -719,13 +713,13 @@ static int open_afs_tables(void)
 	return ret;
 }
 
-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);
 }
 
-static int afs_signal_post_select(struct sched *s, __a_unused struct task *t)
+static int afs_signal_post_select(struct sched *s, __a_unused void *context)
 {
 	int signum, ret;
 
@@ -762,15 +756,18 @@ static void register_signal_task(struct sched *s)
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGHUP);
 
-	st->task.pre_select = signal_pre_select;
-	st->task.post_select = afs_signal_post_select;
-	sprintf(st->task.status, "signal task");
-	register_task(s, &st->task);
+	st->task = task_register(&(struct task_info) {
+		.name = "signal",
+		.pre_select = signal_pre_select,
+		.post_select = afs_signal_post_select,
+		.context = st,
+
+	}, s);
 }
 
 static struct list_head afs_client_list;
 
-/** Describes on connected afs client. */
+/** Describes one connected afs client. */
 struct afs_client {
 	/** Position in the afs client list. */
 	struct list_head node;
@@ -780,9 +777,9 @@ struct afs_client {
 	struct timeval connect_time;
 };
 
-static void command_pre_select(struct sched *s, struct task *t)
+static void command_pre_select(struct sched *s, void *context)
 {
-	struct command_task *ct = container_of(t, struct command_task, task);
+	struct command_task *ct = context;
 	struct afs_client *client;
 
 	para_fd_set(server_socket, &s->rfds, &s->max_fileno);
@@ -917,14 +914,14 @@ 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, struct task *t)
+static int command_post_select(struct sched *s, void *context)
 {
-	struct command_task *ct = container_of(t, struct command_task, task);
+	struct command_task *ct = context;
 	struct sockaddr_un unix_addr;
 	struct afs_client *client, *tmp;
 	int fd, ret;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(ct->task);
 	if (ret < 0)
 		return ret;
 	ret = execute_server_command(&s->rfds);
@@ -972,10 +969,12 @@ static void register_command_task(uint32_t cookie, struct sched *s)
 	ct->fd = setup_command_socket_or_die();
 	ct->cookie = cookie;
 
-	ct->task.pre_select = command_pre_select;
-	ct->task.post_select = command_post_select;
-	sprintf(ct->task.status, "afs command task");
-	register_task(s, &ct->task);
+	ct->task = task_register(&(struct task_info) {
+		.name = "afs command",
+		.pre_select = command_pre_select,
+		.post_select = command_post_select,
+		.context = ct,
+	}, s);
 }
 
 /**
@@ -1007,6 +1006,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
 	ret = schedule(&s);
+	sched_shutdown(&s);
 out_close:
 	close_afs_tables();
 out: