X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=58b04a8bafce749308aefe17d42ebaf178d4d45b;hp=d7c1ecfded5adf25c0a9c81ed86667c614d4f66e;hb=9ca92b91c68fb59989f317fea5e7c5e36cab7458;hpb=7ba6e107eb38c5ceb6f66aac21ad6a5a3afa49ad

diff --git a/afs.c b/afs.c
index d7c1ecfd..58b04a8b 100644
--- a/afs.c
+++ b/afs.c
@@ -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,59 +748,56 @@ 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 == SIGUSR1)
-		return; /* ignore SIGUSR1 */
 	if (st->signum == SIGHUP) {
 		close_afs_tables();
-		t->ret = open_afs_tables();
-		if (t->ret < 0)
-			goto err;
+		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)
 {
 	struct signal_task *st = &signal_task_struct;
+
+	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+		PARA_EMERG_LOG("failed to ignore SIGPIPE\n");
+		exit(EXIT_FAILURE);
+	}
+	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) {
+		PARA_EMERG_LOG("failed to ignore SIGUSR1\n");
+		exit(EXIT_FAILURE);
+	}
 	st->fd = para_signal_init();
 	PARA_INFO_LOG("signal pipe: fd %d\n", st->fd);
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
-	para_install_sighandler(SIGPIPE);
 	para_install_sighandler(SIGHUP);
 
 	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);
 }
@@ -818,14 +816,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;
 }
 
 /**
@@ -898,28 +895,24 @@ static int call_callback(int fd, int query_shmid)
 	return 1;
 }
 
-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)
@@ -960,12 +953,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) {
@@ -984,25 +984,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)
@@ -1013,17 +1011,10 @@ 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);
 }
 
-static void register_tasks(uint32_t cookie)
-{
-	register_signal_task();
-	register_command_task(cookie);
-}
-
 /**
  * Initialize the audio file selector process.
  *
@@ -1032,32 +1023,32 @@ static void register_tasks(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();
 	INIT_LIST_HEAD(&afs_client_list);
 	for (i = 0; i < NUM_AFS_TABLES; i++)
 		afs_tables[i].init(&afs_tables[i]);
 	ret = open_afs_tables();
-
-	if (ret < 0) {
-		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-		exit(EXIT_FAILURE);
-	}
+	if (ret < 0)
+		goto out;
 	server_socket = socket_fd;
 	ret = mark_fd_nonblocking(server_socket);
 	if (ret < 0)
-		exit(EXIT_FAILURE);
+		goto out_close;
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
 		server_socket, (unsigned) cookie);
 	init_admissible_files(conf.afs_initial_mode_arg);
-	register_tasks(cookie);
+	register_command_task(cookie);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
 	ret = schedule(&s);
+out_close:
+	close_afs_tables();
+out:
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-	close_afs_tables();
 	exit(EXIT_FAILURE);
 }