X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=91f6e1e6a474f165870bb4bbe615dccad4fcffbf;hp=5ed7067325ab526132fd80a18f06b4633a993e79;hb=fe7442f069ba33983395ed35af643571a11d9614;hpb=59796673d90ad532d03ebb730f928b2c755fa8b6

diff --git a/audiod.c b/audiod.c
index 5ed70673..91f6e1e6 100644
--- a/audiod.c
+++ b/audiod.c
@@ -520,12 +520,13 @@ static void open_writers(struct slot_info *s)
 	assert(s->wns == NULL);
 	s->wns = para_calloc(PARA_MAX(1U, a->num_writers)
 		* sizeof(struct writer_node));
-	PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]);
 	for (i = 0; i < a->num_writers; i++) {
 		wn = s->wns + i;
 		wn->conf = a->writer_conf[i];
 		wn->writer_num = a->writer_nums[i];
 		register_writer_node(wn, parent, &sched);
+		PARA_NOTICE_LOG("%s writer started in slot %d\n",
+			writer_names[a->writer_nums[i]], (int)(s - slot));
 	}
 }
 
@@ -1006,7 +1007,7 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 	case SIGINT:
 	case SIGTERM:
 	case SIGHUP:
-		PARA_EMERG_LOG("terminating on signal %d\n", signum);
+		PARA_NOTICE_LOG("received signal %d\n", signum);
 		clean_exit(EXIT_FAILURE, "caught deadly signal");
 	}
 	return 0;
@@ -1068,27 +1069,6 @@ static void close_stat_pipe(void)
 	audiod_status_dump();
 }
 
-/**
- * close the connection to para_server and exit
- *
- * \param status the exit status which is passed to exit(3)
- * \param msg the log message
- *
- * Log \a msg with loglevel \p EMERG, close the connection to para_server if
- * open, and call \p exit(status). \a status should be either EXIT_SUCCESS or
- * EXIT_FAILURE.
- *
- * \sa exit(3)
- */
-void __noreturn clean_exit(int status, const char *msg)
-{
-	PARA_EMERG_LOG("%s\n", msg);
-	if (socket_name)
-		unlink(socket_name);
-	close_stat_pipe();
-	exit(status);
-}
-
 /* avoid busy loop if server is down */
 static void set_stat_task_restart_barrier(unsigned seconds)
 {
@@ -1120,20 +1100,51 @@ static bool must_close_slot(int slot_num)
 	return true;
 }
 
+static void close_slot(int slot_num)
+{
+	struct slot_info *s = slot + slot_num;
+
+	PARA_INFO_LOG("closing slot %d\n", slot_num);
+	close_writers(s);
+	close_filters(s);
+	close_receiver(slot_num);
+	clear_slot(slot_num);
+}
+
 static void close_unused_slots(void)
 {
 	int i;
 
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = slot + i;
-		if (!must_close_slot(i))
-			continue;
-		PARA_INFO_LOG("closing slot %d\n", i);
-		close_writers(s);
-		close_filters(s);
-		close_receiver(i);
-		clear_slot(i);
-	}
+	FOR_EACH_SLOT(i)
+		if (must_close_slot(i))
+			close_slot(i);
+}
+
+/**
+ * Close the connection to para_server and exit.
+ *
+ * \param status The exit status which is passed to exit(3).
+ * \param msg The log message
+ *
+ * Log \a msg with loglevel \p EMERG, close the connection to para_server and
+ * all slots, and call \p exit(status). \a status should be either EXIT_SUCCESS
+ * or EXIT_FAILURE.
+ *
+ * \sa exit(3).
+ */
+void __noreturn clean_exit(int status, const char *msg)
+{
+	int i;
+
+	if (socket_name)
+		unlink(socket_name);
+	close_stat_pipe();
+	FOR_EACH_SLOT(i)
+		close_slot(i);
+	audiod_cmdline_parser_free(&conf);
+	close_stat_clients();
+	PARA_EMERG_LOG("%s\n", msg);
+	exit(status);
 }
 
 /*