X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=bc42026e460ac7ba5f38f992ae17e1f18a3c5ce9;hp=0454b8ef8d46f78c8348c74111efcdb31f54f722;hb=3dfab6fc800bec957eee78aa642d0b139300d470;hpb=5a94fb80bc774066d0fc995ca88109fe7d1783b5;ds=sidebyside

diff --git a/afs.c b/afs.c
index 0454b8ef..bc42026e 100644
--- a/afs.c
+++ b/afs.c
@@ -499,7 +499,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;
@@ -747,12 +747,6 @@ 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 = container_of(t, struct signal_task, task);
@@ -763,8 +757,8 @@ static void signal_post_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = container_of(t, struct signal_task, task);
 	if (getppid() == 1) {
-		t->error = -E_AFS_PARENT_DIED;
-		return;
+		PARA_EMERG_LOG("para_server died\n");
+		goto shutdown;
 	}
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
@@ -777,6 +771,8 @@ static void signal_post_select(struct sched *s, struct task *t)
 		init_admissible_files(current_mop);
 		return;
 	}
+	PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+shutdown:
 	sched_shutdown();
 	t->error = -E_AFS_SIGNAL;
 }
@@ -898,28 +894,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)
@@ -964,8 +956,15 @@ static void command_post_select(struct sched *s, struct task *t)
 	struct sockaddr_un unix_addr;
 	struct afs_client *client, *tmp;
 	int fd, ret;
-	if (FD_ISSET(server_socket, &s->rfds))
-		execute_server_command();
+
+	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) {