From 3f1510c31beb5c053d2f6c510f04a1e7466fce65 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sun, 8 Jul 2012 14:58:45 +0000
Subject: [PATCH] audiod: Replace kill_btrn() by task notifications.

---
 audiod.c        | 21 +++------------------
 client_common.c |  4 +++-
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/audiod.c b/audiod.c
index f8dde0c2..03705089 100644
--- a/audiod.c
+++ b/audiod.c
@@ -440,20 +440,6 @@ 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 **btrnp, struct task *t, int error)
-{
-	if (t->error < 0)
-		return;
-	t->error = error;
-	btr_remove_node(btrnp);
-}
-
 static void notify_receivers(int error)
 {
 	int i;
@@ -1197,7 +1183,7 @@ static void status_post_select(struct sched *s, struct task *t)
 		if (!st->ct)
 			goto out;
 		if (st->ct->task.error >= 0) {
-			kill_btrn(&st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
+			task_notify(&st->ct->task, E_AUDIOD_OFF);
 			goto out;
 		}
 		close_stat_pipe();
@@ -1219,15 +1205,14 @@ static void status_post_select(struct sched *s, struct task *t)
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
 			if (diff.tv_sec > 61)
-				kill_btrn(&st->ct->btrn, &st->ct->task,
-					-E_STATUS_TIMEOUT);
+				task_notify(&st->ct->task, E_AUDIOD_OFF);
 			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) {
-			kill_btrn(&st->ct->btrn, &st->ct->task, ret);
+			task_notify(&st->ct->task, E_AUDIOD_OFF);
 			goto out;
 		}
 		if (sz != ret) {
diff --git a/client_common.c b/client_common.c
index a4aa6d8c..78b232db 100644
--- a/client_common.c
+++ b/client_common.c
@@ -333,7 +333,9 @@ static void client_post_select(struct sched *s, struct task *t)
 	size_t n;
 	char buf[CLIENT_BUFSIZE];
 
-	t->error = 0;
+	ret = task_get_notification(t);
+	if (ret < 0)
+		goto out;
 	if (ct->scc.fd < 0)
 		return;
 	switch (ct->status) {
-- 
2.39.5