X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=4b2c65f7a48e381ea016f4f8276b15c2e1766f1d;hb=4ba472b7148a36788b9b86702a3828b189c7c2ac;hp=128f7b424828c4c1b5966912d32a931427accc51;hpb=e35be295c787fae6e79d35a18a70e988a982b3df;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 128f7b42..4b2c65f7 100644
--- a/audiod.c
+++ b/audiod.c
@@ -357,6 +357,7 @@ static void close_writers(struct slot_info *s)
 
 	if (s->format < 0)
 		return;
+	assert(s->wns);
 	a = afi + s->format;
 	if (a->num_writers == 0)
 		writer_cleanup(s->wns);
@@ -389,6 +390,20 @@ static void close_filters(struct slot_info *s)
 	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;
@@ -401,12 +416,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);
 	}
 }
 
@@ -464,7 +480,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;
@@ -517,7 +537,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);
@@ -1091,9 +1112,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;