X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2367d9cb443ecc1d0f52f64e31f76a731b13c8b4;hp=8552af6b07d2d4d977fe4f0587c552c42f1bf038;hb=70677862e5548461918ce42af206cdca61dc250f;hpb=9d75ded33ce6664156acb07e311f51d55970bbea

diff --git a/audiod.c b/audiod.c
index 8552af6b..2367d9cb 100644
--- a/audiod.c
+++ b/audiod.c
@@ -428,7 +428,7 @@ static void close_filters(struct slot_info *s)
 	struct audio_format_info *a = afi + s->format;
 	if (a->num_filters == 0)
 		return;
-	for (i = 0; i < a->num_filters; i++) {
+	for (i = a->num_filters - 1; i >= 0; i--) {
 		struct filter_node *fn = s->fns + i;
 		struct filter *f;
 
@@ -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));
 	}
 }
 
@@ -914,7 +915,7 @@ out:
 
 static int parse_filter_args(void)
 {
-	int i, j, ret, af_mask;
+	int i, j, ret, af_mask, num_matches;
 
 	for (i = 0; i < conf.filter_given; i++) {
 		char *arg;
@@ -922,13 +923,18 @@ static int parse_filter_args(void)
 		if (ret < 0)
 			goto out;
 		af_mask = ret;
+		num_matches = 0;
 		FOR_EACH_AUDIO_FORMAT(j) {
 			if ((af_mask & (1 << j)) == 0) /* no match */
 				continue;
 			ret = add_filter(j, arg);
 			if (ret < 0)
 				goto out;
+			num_matches++;
 		}
+		if (num_matches == 0)
+			PARA_WARNING_LOG("ignoring filter spec: %s\n",
+				conf.filter_arg[i]);
 	}
 	ret = init_default_filters(); /* use default values for the rest */
 out:
@@ -1063,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)
 {
@@ -1115,20 +1100,50 @@ 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;
+
+	PARA_EMERG_LOG("%s\n", msg);
+	if (socket_name)
+		unlink(socket_name);
+	close_stat_pipe();
+	FOR_EACH_SLOT(i)
+		close_slot(i);
+	audiod_cmdline_parser_free(&conf);
+	exit(status);
 }
 
 /*
@@ -1216,21 +1231,21 @@ static int status_post_select(struct sched *s, struct task *t)
 			close_stat_pipe();
 			goto out;
 		}
-		if (st->ct->status != CL_RECEIVING)
+		if (st->ct->status != CL_EXECUTING)
 			goto out;
 		ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
 		if (ret <= 0) {
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
 			if (diff.tv_sec > 61)
-				task_notify(&st->ct->task, E_AUDIOD_OFF);
+				task_notify(&st->ct->task, E_STATUS_TIMEOUT);
 			goto out;
 		}
 		btr_merge(st->btrn, st->min_iqs);
 		sz = btr_next_buffer(st->btrn, &buf);
 		ret = for_each_stat_item(buf, sz, update_item);
 		if (ret < 0) {
-			task_notify(&st->ct->task, E_AUDIOD_OFF);
+			task_notify(&st->ct->task, -ret);
 			goto out;
 		}
 		if (sz != ret) {