X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=b8acb53a9ffa2782e8fc0421a9a01f5642347eed;hp=451a492c8bfe9871dd22c51121eadfd69aeee3ec;hb=de9a70360fcd3b5285d280ad1f229f679d453603;hpb=2ef1e962280493eee9092da3122760805b793112

diff --git a/afs.c b/afs.c
index 451a492c..b8acb53a 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -75,6 +75,7 @@ struct command_task {
 	struct task task;
 };
 
+extern int mmd_mutex;
 extern struct misc_meta_data *mmd;
 
 static int server_socket;
@@ -499,7 +500,7 @@ static int pass_afd(int fd, char *buf, size_t size)
  *
  * \sa open_and_update_audio_file().
  */
-int open_next_audio_file(void)
+static int open_next_audio_file(void)
 {
 	struct osl_row *aft_row;
 	struct audio_file_data afd;
@@ -571,15 +572,15 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 		free(current_mop);
 		if (arg) {
 			current_mop = para_strdup(arg);
-			mmd_lock();
+			mutex_lock(mmd_mutex);
 			strncpy(mmd->afs_mode_string, arg,
 				sizeof(mmd->afs_mode_string));
 			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
-			mmd_unlock();
+			mutex_unlock(mmd_mutex);
 		} else {
-			mmd_lock();
+			mutex_lock(mmd_mutex);
 			strcpy(mmd->afs_mode_string, "dummy");
-			mmd_unlock();
+			mutex_unlock(mmd_mutex);
 			current_mop = NULL;
 		}
 	}
@@ -747,42 +748,35 @@ static int open_afs_tables(void)
 	return ret;
 }
 
-static void unregister_tasks(void)
-{
-	unregister_task(&command_task_struct.task);
-	unregister_task(&signal_task_struct.task);
-}
-
 static void signal_pre_select(struct sched *s, struct task *t)
 {
-	struct signal_task *st = t->private_data;
-	t->ret = 1;
+	struct signal_task *st = container_of(t, struct signal_task, task);
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
 static void signal_post_select(struct sched *s, struct task *t)
 {
-	struct signal_task *st = t->private_data;
-	t->ret = -E_AFS_PARENT_DIED;
-	if (getppid() == 1)
-		goto err;
-	t->ret = 1;
+	struct signal_task *st = container_of(t, struct signal_task, task);
+	if (getppid() == 1) {
+		PARA_EMERG_LOG("para_server died\n");
+		goto shutdown;
+	}
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
 	st->signum = para_next_signal();
-	t->ret = 1;
 	if (st->signum == SIGHUP) {
 		close_afs_tables();
-		t->ret = open_afs_tables();
-		if (t->ret < 0)
-			goto err;
+		parse_config_or_die(1);
+		t->error = open_afs_tables();
+		if (t->error < 0)
+			return;
 		init_admissible_files(current_mop);
 		return;
 	}
-	t->ret = -E_AFS_SIGNAL;
-err:
-	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-	unregister_tasks();
+	PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+shutdown:
+	sched_shutdown();
+	t->error = -E_AFS_SIGNAL;
 }
 
 static void register_signal_task(void)
@@ -805,7 +799,6 @@ static void register_signal_task(void)
 
 	st->task.pre_select = signal_pre_select;
 	st->task.post_select = signal_post_select;
-	st->task.private_data = st;
 	sprintf(st->task.status, "signal task");
 	register_task(&st->task);
 }
@@ -824,14 +817,13 @@ struct afs_client {
 
 static void command_pre_select(struct sched *s, struct task *t)
 {
-	struct command_task *ct = t->private_data;
+	struct command_task *ct = container_of(t, struct command_task, task);
 	struct afs_client *client;
 
 	para_fd_set(server_socket, &s->rfds, &s->max_fileno);
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 	list_for_each_entry(client, &afs_client_list, node)
 		para_fd_set(client->fd, &s->rfds, &s->max_fileno);
-	t->ret = 1;
 }
 
 /**
@@ -901,31 +893,27 @@ static int call_callback(int fd, int query_shmid)
 	query.data = (char *)query_shm + sizeof(*cq);
 	query.size = cq->query_size;
 	cq->handler(fd, &query);
-	return 1;
+	return shm_detach(query_shm);
 }
 
-static void execute_server_command(void)
+static int execute_server_command(void)
 {
 	char buf[8];
 	int ret = recv_bin_buffer(server_socket, buf, sizeof(buf) - 1);
 
 	if (ret <= 0) {
-		if (ret < 0)
-			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-		return;
+		if (!ret)
+			ret = -ERRNO_TO_PARA_ERROR(ECONNRESET);
+		goto err;
 	}
 	buf[ret] = '\0';
 	PARA_DEBUG_LOG("received: %s\n", buf);
-	if (!strcmp(buf, "new")) {
-		ret = open_next_audio_file();
-		if (ret < 0) {
-			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-			unregister_tasks();
-		}
-		return;
-	}
-	PARA_ERROR_LOG("unknown command\n");
-
+	ret = -E_BAD_CMD;
+	if (strcmp(buf, "new"))
+		goto err;
+	ret = open_next_audio_file();
+err:
+	return ret;
 }
 
 static void execute_afs_command(int fd, uint32_t expected_cookie)
@@ -966,12 +954,19 @@ err:
 
 static void command_post_select(struct sched *s, struct task *t)
 {
-	struct command_task *ct = t->private_data;
+	struct command_task *ct = container_of(t, struct command_task, task);
 	struct sockaddr_un unix_addr;
 	struct afs_client *client, *tmp;
-	int fd;
-	if (FD_ISSET(server_socket, &s->rfds))
-		execute_server_command();
+	int fd, ret;
+
+	if (FD_ISSET(server_socket, &s->rfds)) {
+		ret = execute_server_command();
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+			sched_shutdown();
+			return;
+		}
+	}
 
 	/* Check the list of connected clients. */
 	list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
@@ -990,25 +985,23 @@ static void command_post_select(struct sched *s, struct task *t)
 	}
 	/* Accept connections on the local socket. */
 	if (!FD_ISSET(ct->fd, &s->rfds))
-		goto out;
-	t->ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
-	if (t->ret < 0) {
-		PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-		goto out;
+		return;
+	ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
+	if (ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+		return;
 	}
-	fd = t->ret;
-	t->ret = mark_fd_nonblocking(fd);
-	if (t->ret < 0) {
-		PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+	fd = ret;
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		close(fd);
-		goto out;
+		return;
 	}
 	client = para_malloc(sizeof(*client));
 	client->fd = fd;
 	client->connect_time = *now;
 	para_list_add(&client->node, &afs_client_list);
-out:
-	t->ret = 1;
 }
 
 static void register_command_task(uint32_t cookie)
@@ -1019,7 +1012,6 @@ static void register_command_task(uint32_t cookie)
 
 	ct->task.pre_select = command_pre_select;
 	ct->task.post_select = command_post_select;
-	ct->task.private_data = ct;
 	sprintf(ct->task.status, "command task");
 	register_task(&ct->task);
 }
@@ -1032,7 +1024,7 @@ static void register_command_task(uint32_t cookie)
  */
 __noreturn void afs_init(uint32_t cookie, int socket_fd)
 {
-	struct sched s;
+	static struct sched s;
 	int i, ret;
 
 	register_signal_task();
@@ -1114,7 +1106,7 @@ int com_init(int fd, int argc, char * const * const argv)
 				return -E_BAD_TABLE_NAME;
 		}
 	}
-	ret = send_callback_request(create_tables_callback, &query, NULL, NULL);
+	ret = send_callback_request(create_tables_callback, &query, &send_result, &fd);
 	if (ret < 0)
 		return send_va_buffer(fd, "%s\n", para_strerror(-ret));
 	return ret;
@@ -1183,6 +1175,16 @@ int com_check(int fd, int argc, char * const * const argv)
 	return 1;
 }
 
+/**
+ * The afs event dispatcher.
+ *
+ * \param event Type of the event.
+ * \param pb May be \p NULL.
+ * \param data Type depends on \a event.
+ *
+ * This function calls the table handlers of all tables and passes \a pb and \a
+ * data verbatim. It's up to the handlers to interpret the \a data pointer.
+ */
 void afs_event(enum afs_events event, struct para_buffer *pb,
 		void *data)
 {
@@ -1194,7 +1196,8 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
 			continue;
 		ret = t->event_handler(event, pb, data);
 		if (ret < 0)
-			PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+			PARA_CRIT_LOG("table %s, event %d: %s\n", t->name,
+				event, para_strerror(-ret));
 	}
 }