X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=72276ffe072f1a24fa67ac866e18c4d9a33889cd;hp=9bb40e073b885c88216054d322c5cf4dd950e23e;hb=0113172c1f18f4a168b0a0fdacb376da2f2a73e3;hpb=810761a3cdf3f75dd8e07a5d903793048c36df1d

diff --git a/audiod.c b/audiod.c
index 9bb40e07..72276ffe 100644
--- a/audiod.c
+++ b/audiod.c
@@ -110,6 +110,8 @@ struct status_task {
 	struct timeval clock_diff_barrier;
 	/** Number of the audio format as announced by para_server. */
 	int current_audio_format_num;
+	/* The status task btrn is the child of the client task. */
+	struct btr_node *btrn;
 };
 
 /** The array of status items sent by para_server. */
@@ -357,6 +359,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);
@@ -381,13 +384,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 +418,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);
 	}
 }
 
@@ -463,13 +482,17 @@ 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;
 		PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
-			audio_formats[s->format], i,  nf, f->name, s - slot);
-		sprintf(fn->task.status, "%s (slot %d)", f->name, s - slot);
+			audio_formats[s->format], i,  nf, f->name, (int)(s - slot));
+		sprintf(fn->task.status, "%s (slot %d)", f->name, (int)(s - slot));
 	}
 }
 
@@ -516,7 +539,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);
@@ -579,41 +603,22 @@ struct btr_node *audiod_get_btr_root(void)
 	return slot[newest_slot].receiver_node->btrn;
 }
 
-/* returns slot num on success. */
-static int open_current_receiver(struct sched *s)
+/* whether a new instance of a decoder should be started. */
+static bool must_start_decoder(void)
 {
-	struct timeval diff;
 	int ret, cafn = stat_task->current_audio_format_num;
 
 	if (cafn < 0 || !stat_task->ct)
-		return -1;
+		return false;
 	/* Do nothing if the 'N' flag is set or the 'P' flag is unset */
 	if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
-		return -1;
+		return false;
 	ret = receiver_running(cafn);
-	if (ret > 0) /* already running and not eof */
-		return -1;
-	if (ret < 0) { /* eof */
-		/*
-		 * para_server uses a zero start time during the announcement
-		 * period, i.e. before it sends the first chunk. Wait until
-		 * this period begins to avoid restarting the receiver that
-		 * belongs to the file just completed.
-		 */
-		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)
-			sched_request_timeout(&diff, s);
-		else
-			sched_min_delay(s);
-		return -1;
-	}
-	/* start a new receiver */
-	return open_receiver(cafn);
+	if (ret != 0) /* already running */
+		return false;
+	if (tv_diff(now, &afi[cafn].restart_barrier, NULL) < 0)
+		return false;
+	return true;
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
@@ -648,9 +653,9 @@ static unsigned compute_time_diff(const struct timeval *status_time)
 		&tmp);
 	stat_task->sa_time_diff = tmp;
 	PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
-		sign > 0? "+" : "-",
+		sign < 0? "-" : "+",
 		tv2ms(&diff),
-		sa_time_diff_sign ? "+" : "-",
+		sa_time_diff_sign < 0? "-" : "+",
 		tv2ms(&stat_task->sa_time_diff)
 	);
 out:
@@ -1010,6 +1015,7 @@ static void close_stat_pipe(void)
 {
 	if (!stat_task->ct)
 		return;
+	btr_free_node(stat_task->ct->btrn);
 	client_close(stat_task->ct);
 	stat_task->ct = NULL;
 	clear_and_dump_items();
@@ -1048,52 +1054,52 @@ static void set_stat_task_restart_barrier(unsigned seconds)
 	tv_add(now, &delay, &stat_task->restart_barrier);
 }
 
-static bool try_to_close_slot(int slot_num)
+static void try_to_close_slot(int slot_num)
 {
 	struct slot_info *s = &slot[slot_num];
 	struct audio_format_info *a = afi + s->format;
 	int i;
 
 	if (s->format < 0)
-		return false;
+		return;
 	if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
-		return false;
+		return;
 	for (i = 0; i < a->num_filters; i++)
 		if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
-			return false;
+			return;
 	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;
+				return;
 	} else {
 		if (s->wns && s->wns[0].task.error != -E_TASK_UNREGISTERED)
-			return false;
+			return;
 	}
 	PARA_INFO_LOG("closing slot %d\n", slot_num);
 	close_writers(s);
 	close_filters(s);
 	close_receiver(slot_num);
 	clear_slot(slot_num);
-	return true;
 }
 
 /*
  * Check if any receivers/filters/writers need to be started and do so if
  * necessary.
  */
-static void start_stop_decoders(struct sched *s)
+static void start_stop_decoders(void)
 {
 	int i, ret;
 	struct slot_info *sl;
 	struct audio_format_info *a;
 
 	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);
-	ret = open_current_receiver(s);
+		try_to_close_slot(i);
+	if (audiod_status != AUDIOD_ON ||
+			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
+		return kill_all_decoders(-E_NOT_PLAYING);
+	if (!must_start_decoder())
+		return;
+	ret = open_receiver(stat_task->current_audio_format_num);
 	if (ret < 0)
 		return;
 	sl = slot + ret;
@@ -1103,11 +1109,29 @@ static void start_stop_decoders(struct sched *s)
 	open_writers(sl);
 	activate_grab_clients();
 	btr_log_tree(sl->receiver_node->btrn, LL_NOTICE);
+}
+
+static void status_pre_select(struct sched *s, struct task *t)
+{
+	struct status_task *st = container_of(t, struct status_task, task);
+	int ret, cafn = stat_task->current_audio_format_num;
+
+	if (must_start_decoder())
+		goto min_delay;
+	ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
+	if (ret > 0)
+		goto min_delay;
+	if (!st->ct)
+		sched_request_barrier_or_min_delay(&st->restart_barrier, s);
+	if (cafn >= 0)
+		sched_request_barrier(&afi[cafn].restart_barrier, s);
+	return;
+min_delay:
 	sched_min_delay(s);
 }
 
 /* restart the client task if necessary */
-static void status_pre_select(struct sched *s, struct task *t)
+static void status_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct status_task *st = container_of(t, struct status_task, task);
 
@@ -1115,7 +1139,7 @@ static void status_pre_select(struct sched *s, struct task *t)
 		if (!st->ct)
 			goto out;
 		if (st->ct->task.error >= 0) {
-			st->ct->task.error = -E_AUDIOD_OFF;
+			kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
 			goto out;
 		}
 		if (st->ct->task.error != -E_TASK_UNREGISTERED)
@@ -1125,6 +1149,8 @@ static void status_pre_select(struct sched *s, struct task *t)
 		goto out;
 	}
 	if (st->ct) {
+		char *buf;
+		size_t sz;
 		int ret;
 		if (st->ct->task.error < 0) {
 			if (st->ct->task.error != -E_TASK_UNREGISTERED)
@@ -1134,21 +1160,25 @@ static void status_pre_select(struct sched *s, struct task *t)
 		}
 		if (st->ct->status != CL_RECEIVING)
 			goto out;
-		ret = for_each_stat_item(st->ct->buf, st->ct->loaded,
-			update_item);
+		ret = btr_node_status(st->btrn, 0, BTR_NT_LEAF);
+		if (ret <= 0)
+			goto out;
+		sz = btr_next_buffer(st->btrn, &buf);
+		ret = for_each_stat_item(buf, sz, update_item);
 		if (ret < 0) {
-			st->ct->task.error = ret;
+			kill_btrn(st->ct->btrn, &st->ct->task, ret);
 			goto out;
 		}
-		if (st->ct->loaded != ret) {
+		if (sz != ret)
 			st->last_status_read = *now;
-			st->ct->loaded = ret;
-		} else {
+		else {
 			struct timeval diff;
 			tv_diff(now, &st->last_status_read, &diff);
 			if (diff.tv_sec > 61)
-				st->ct->task.error = -E_STATUS_TIMEOUT;
+				kill_btrn(st->ct->btrn, &st->ct->task,
+					-E_STATUS_TIMEOUT);
 		}
+		btr_consume(st->btrn, sz - ret);
 		goto out;
 	}
 	if (tv_diff(now, &st->restart_barrier, NULL) < 0)
@@ -1158,16 +1188,14 @@ static void status_pre_select(struct sched *s, struct task *t)
 		int argc = 5;
 		PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
 		st->clock_diff_count--;
-		client_open(argc, argv, &st->ct, NULL);
+		client_open(argc, argv, &st->ct, NULL, NULL, st->btrn);
 		set_stat_task_restart_barrier(2);
-		sched_min_delay(s);
 
 	} else {
 		char *argv[] = {"audiod", "--", "stat", "-p", NULL};
 		int argc = 4;
-		client_open(argc, argv, &st->ct, NULL);
+		client_open(argc, argv, &st->ct, NULL, NULL, st->btrn);
 		set_stat_task_restart_barrier(5);
-		sched_min_delay(s);
 	}
 	free(stat_item_values[SI_BASENAME]);
 	stat_item_values[SI_BASENAME] = para_strdup(
@@ -1175,17 +1203,20 @@ static void status_pre_select(struct sched *s, struct task *t)
 	stat_client_write_item(SI_BASENAME);
 	st->last_status_read = *now;
 out:
-	start_stop_decoders(s);
+	start_stop_decoders();
 }
 
 static void init_status_task(struct status_task *st)
 {
 	memset(st, 0, sizeof(struct status_task));
 	st->task.pre_select = status_pre_select;
+	st->task.post_select = status_post_select;
 	st->sa_time_diff_sign = 1;
 	st->clock_diff_count = conf.clock_diff_count_arg;
 	st->current_audio_format_num = -1;
-	sprintf(st->task.status, "status task");
+	sprintf(st->task.status, "stat");
+	st->btrn = btr_new_node(&(struct btr_node_description)
+		EMBRACE(.name = "stat"));
 }
 
 static void set_initial_status(void)