X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2bda0f69b4fc047e81f191f690682ecdb3b52db5;hp=322ce3be64a3ccc1030b1c7de0018805813ebcc9;hb=5ec0d9ef2189e22b3ee80f661196b6ae0593a525;hpb=67f523883f58d95db99b6a1b32c62b2645838ac9

diff --git a/audiod.c b/audiod.c
index 322ce3be..2bda0f69 100644
--- a/audiod.c
+++ b/audiod.c
@@ -368,7 +368,7 @@ static void close_writers(struct slot_info *s)
 	s->wns = NULL;
 }
 
-static void _close_filters(struct slot_info *s)
+static void close_filters(struct slot_info *s)
 {
 	int i;
 	struct audio_format_info *a = afi + s->format;
@@ -376,15 +376,33 @@ static void _close_filters(struct slot_info *s)
 		return;
 	for (i = 0; i < a->num_filters; i++) {
 		struct filter_node *fn = s->fns + i;
-		struct filter *f = filters + fn->filter_num;
+		struct filter *f;
 
-		f->close(fn);
+		if (!fn)
+			continue;
+		f = filters + fn->filter_num;
+		if (f->close)
+			f->close(fn);
 		btr_free_node(fn->btrn);
 	}
 	free(s->fns);
 	s->fns = NULL;
 }
 
+/*
+ * Whenever a task commits suicide by returning from post_select with t->error
+ * < 0, it also removes its btr node. We do exactly that to kill a running
+ * task. Note that the scheduler checks t->error also _before_ each pre/post
+ * select call, so the victim will never be scheduled again.
+ */
+static void kill_btrn(struct btr_node *btrn, struct task *t, int error)
+{
+	if (t->error < 0)
+		return;
+	t->error = error;
+	btr_remove_node(btrn);
+}
+
 static void kill_all_decoders(int error)
 {
 	int i, j;
@@ -397,12 +415,13 @@ static void kill_all_decoders(int error)
 		a = afi + s->format;
 		if (s->wns)
 			for (j = 0; j < a->num_writers; j++)
-				s->wns[j].task.error = error;
+				kill_btrn(s->wns[j].btrn, &s->wns[j].task, error);
 		if (s->fns)
 			for (j = 0; j < a->num_writers; j++)
-				s->fns[j].task.error = error;
+				kill_btrn(s->fns[j].btrn, &s->wns[j].task, error);
 		if (s->receiver_node)
-			s->receiver_node->task.error = error;
+			kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
+				error);
 	}
 }
 
@@ -460,7 +479,11 @@ static void open_filters(struct slot_info *s)
 		fn->conf = a->filter_conf[i];
 		fn->task.pre_select = f->pre_select;
 		fn->task.post_select = f->post_select;
-		fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
+
+		fn->btrn = btr_new_node(&(struct btr_node_description)
+			EMBRACE(.name = f->name, .parent = parent,
+				.handler = f->execute, .context = fn));
+
 		f->open(fn);
 		register_task(&fn->task);
 		parent = fn->btrn;
@@ -513,7 +536,8 @@ static int open_receiver(int format)
 	rn = s->receiver_node;
 	rn->receiver = r;
 	rn->conf = a->receiver_conf;
-	rn->btrn = btr_new_node(r->name, NULL, NULL, rn);
+	rn->btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = r->name, .context = rn));
 	ret = r->open(rn);
 	if (ret < 0) {
 		btr_free_node(rn->btrn);
@@ -597,12 +621,14 @@ static int open_current_receiver(struct sched *s)
 		 * this period begins to avoid restarting the receiver that
 		 * belongs to the file just completed.
 		 */
-		if (stat_task->server_stream_start.tv_sec != 0)
+		if (stat_task->server_stream_start.tv_sec != 0) {
 			sched_request_timeout_ms(100, s);
+			return -1;
+		}
 	}
 	if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
 		if (tv_diff(&s->timeout, &diff, NULL) > 0)
-			s->timeout = diff;
+			sched_request_timeout(&diff, s);
 		else
 			sched_min_delay(s);
 		return -1;
@@ -1056,12 +1082,17 @@ static bool try_to_close_slot(int slot_num)
 	for (i = 0; i < a->num_filters; i++)
 		if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
 			return false;
-	for (i = 0; i < a->num_writers; i++)
-		if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+	if (a->num_writers > 0) {
+		for (i = 0; i < a->num_writers; i++)
+			if (s->wns && s->wns[i].task.error != -E_TASK_UNREGISTERED)
+				return false;
+	} else {
+		if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
 			return false;
+	}
 	PARA_INFO_LOG("closing slot %d\n", slot_num);
 	close_writers(s);
-	_close_filters(s);
+	close_filters(s);
 	close_receiver(slot_num);
 	clear_slot(slot_num);
 	return true;
@@ -1080,9 +1111,9 @@ static void start_stop_decoders(struct sched *s)
 	FOR_EACH_SLOT(i)
 		if (try_to_close_slot(i))
 			sched_min_delay(s);
-//	if (audiod_status != AUDIOD_ON ||
-//			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
-//		return kill_all_decoders(-E_NOT_PLAYING);
+	if (audiod_status != AUDIOD_ON ||
+			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
+		return kill_all_decoders(-E_NOT_PLAYING);
 	ret = open_current_receiver(s);
 	if (ret < 0)
 		return;