X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2819091b80a2c27991df0ae0f3a95290e7423916;hp=a11835f287605e96a5142094fae4a8e8db03720d;hb=b80d97a65e7ce689d9598f2aed283f2fd14dde64;hpb=f99a902ab25a4f51d803b187e66ddc7ca0eb58a2

diff --git a/audiod.c b/audiod.c
index a11835f2..2819091b 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;
@@ -381,13 +381,28 @@ static void _close_filters(struct slot_info *s)
 		if (!fn)
 			continue;
 		f = filters + fn->filter_num;
-		f->close(fn);
+		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;
@@ -400,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);
 	}
 }
 
@@ -1071,7 +1087,7 @@ static bool try_to_close_slot(int slot_num)
 	}
 	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;
@@ -1090,9 +1106,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;