X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=6b77e338565dc633c15d891f9ed05de73fa38f96;hp=1d8cc4c1a76c7622a59abd1de2b4b7c678bc4925;hb=879e52d49df6d00aa9eafe5cccb48bbd24ed4c81;hpb=c5056b00502d27e602cfcd716f92e5f85f97b470

diff --git a/audiod.c b/audiod.c
index 1d8cc4c1..6b77e338 100644
--- a/audiod.c
+++ b/audiod.c
@@ -93,14 +93,10 @@ enum vss_status_flags {
  */
 struct sched sched = {.max_fileno = 0};
 
-/**
- * The task for obtaining para_server's status (para_client stat).
- *
- * \sa struct task, struct sched.
- */
+/* The task for obtaining para_server's status (para_client stat). */
 struct status_task {
 	/** The associated task structure of audiod. */
-	struct task task;
+	struct task *task;
 	/** Client data associated with the stat task. */
 	struct client_task *ct;
 	/** Do not restart client command until this time. */
@@ -168,7 +164,7 @@ struct command_task {
 	/** the local listening socket */
 	int fd;
 	/** the associated task structure */
-	struct task task;
+	struct task *task;
 };
 
 /** iterate over all supported audio formats */
@@ -593,7 +589,7 @@ static bool receiver_running(void)
 
 		if (!s->receiver_node)
 			continue;
-		if (s->receiver_node->task->error >= 0)
+		if (task_status(s->receiver_node->task) >= 0)
 			return true;
 		if (ss1 == ss2)
 			return true;
@@ -620,7 +616,7 @@ struct btr_node *audiod_get_btr_root(void)
 		struct timeval rstime;
 		if (!s->receiver_node)
 			continue;
-		if (s->receiver_node->task->error < 0)
+		if (task_status(s->receiver_node->task) < 0)
 			continue;
 		btr_get_node_start(s->receiver_node->btrn, &rstime);
 		if (newest_slot >= 0 && tv_diff(&rstime, &newest_rstime, NULL) < 0)
@@ -1004,16 +1000,15 @@ err:
 	exit(EXIT_FAILURE);
 }
 
-static void signal_pre_select(struct sched *s, struct task *t)
+static void signal_pre_select(struct sched *s, void *context)
 {
-	struct signal_task *st = container_of(t, struct signal_task, task);
+	struct signal_task *st = context;
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static int signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused void *context)
 {
 	int signum;
-
 	signum = para_next_signal(&s->rfds);
 	switch (signum) {
 	case SIGINT:
@@ -1025,23 +1020,16 @@ static int signal_post_select(struct sched *s, __a_unused struct task *t)
 	return 0;
 }
 
-static void signal_setup_default(struct signal_task *st)
-{
-	st->task.pre_select = signal_pre_select;
-	st->task.post_select = signal_post_select;
-	sprintf(st->task.status, "signal task");
-}
-
-static void command_pre_select(struct sched *s, struct task *t)
+static void command_pre_select(struct sched *s, void *context)
 {
-	struct command_task *ct = container_of(t, struct command_task, task);
+	struct command_task *ct = context;
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 }
 
-static int command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, void *context)
 {
 	int ret;
-	struct command_task *ct = container_of(t, struct command_task, task);
+	struct command_task *ct = context;
 	static struct timeval last_status_dump;
 	struct timeval tmp, delay;
 	bool force = true;
@@ -1076,11 +1064,14 @@ dump:
 
 static void init_command_task(struct command_task *ct)
 {
-	ct->task.pre_select = command_pre_select;
-	ct->task.post_select = command_post_select;
-	ct->task.error = 0;
 	ct->fd = audiod_get_socket(); /* doesn't return on errors */
-	sprintf(ct->task.status, "command task");
+
+	ct->task = task_register(&(struct task_info) {
+		.name = "command",
+		.pre_select = command_pre_select,
+		.post_select = command_post_select,
+		.context = ct,
+	}, &sched);
 }
 
 static void close_stat_pipe(void)
@@ -1088,6 +1079,7 @@ static void close_stat_pipe(void)
 	if (!stat_task->ct)
 		return;
 	client_close(stat_task->ct);
+	task_reap(&stat_task->ct->task);
 	stat_task->ct = NULL;
 	clear_and_dump_items();
 	stat_task->length_seconds = 0;
@@ -1112,17 +1104,17 @@ static bool must_close_slot(int slot_num)
 
 	if (s->format < 0)
 		return false;
-	if (s->receiver_node && s->receiver_node->task->error >= 0)
+	if (s->receiver_node && task_status(s->receiver_node->task) >= 0)
 		return false;
 	for (i = 0; i < a->num_filters; i++)
-		if (s->fns && s->fns[i].task->error >= 0)
+		if (s->fns && task_status(s->fns[i].task) >= 0)
 			return false;
 	if (a->num_writers > 0) {
 		for (i = 0; i < a->num_writers; i++)
-			if (s->wns && s->wns[i].task->error >= 0)
+			if (s->wns && task_status(s->wns[i].task) >= 0)
 				return false;
 	} else {
-		if (s->wns && s->wns[0].task->error >= 0)
+		if (s->wns && task_status(s->wns[0].task) >= 0)
 			return false;
 	}
 	return true;
@@ -1199,9 +1191,9 @@ static void start_stop_decoders(void)
 	btr_log_tree(sl->receiver_node->btrn, LL_NOTICE);
 }
 
-static void status_pre_select(struct sched *s, struct task *t)
+static void status_pre_select(struct sched *s, void *context)
 {
-	struct status_task *st = container_of(t, struct status_task, task);
+	struct status_task *st = context;
 	int i, ret, cafn = stat_task->current_audio_format_num;
 
 	if (must_start_decoder())
@@ -1231,15 +1223,15 @@ min_delay:
 }
 
 /* restart the client task if necessary */
-static int status_post_select(struct sched *s, struct task *t)
+static int status_post_select(struct sched *s, void *context)
 {
-	struct status_task *st = container_of(t, struct status_task, task);
+	struct status_task *st = context;
 
 	if (audiod_status == AUDIOD_OFF) {
 		if (!st->ct)
 			goto out;
-		if (st->ct->task.error >= 0) {
-			task_notify(&st->ct->task, E_AUDIOD_OFF);
+		if (task_status(st->ct->task) >= 0) {
+			task_notify(st->ct->task, E_AUDIOD_OFF);
 			goto out;
 		}
 		close_stat_pipe();
@@ -1262,14 +1254,14 @@ static int 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)
-				task_notify(&st->ct->task, E_STATUS_TIMEOUT);
+				task_notify(st->ct->task, E_STATUS_TIMEOUT);
 			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) {
-			task_notify(&st->ct->task, -ret);
+			task_notify(st->ct->task, -ret);
 			goto out;
 		}
 		if (sz != ret) {
@@ -1311,14 +1303,18 @@ out:
 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, "stat");
 	st->btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = "stat"));
+
+	stat_task->task = task_register(&(struct task_info) {
+		.name = "stat",
+		.pre_select = status_pre_select,
+		.post_select = status_post_select,
+		.context = stat_task,
+	}, &sched);
 }
 
 static void set_initial_status(void)
@@ -1422,7 +1418,6 @@ int main(int argc, char *argv[])
 	FOR_EACH_SLOT(i)
 		clear_slot(i);
 	setup_signal_handling();
-	signal_setup_default(sig_task);
 
 	init_status_task(stat_task);
 	init_command_task(cmd_task);
@@ -1430,9 +1425,13 @@ int main(int argc, char *argv[])
 	if (conf.daemon_given)
 		daemonize(false /* parent exits immediately */);
 
-	register_task(&sched, &sig_task->task);
-	register_task(&sched, &cmd_task->task);
-	register_task(&sched, &stat_task->task);
+	sig_task->task = task_register(&(struct task_info) {
+		.name = "signal",
+		.pre_select = signal_pre_select,
+		.post_select = signal_post_select,
+		.context = sig_task,
+	}, &sched);
+
 	sched.default_timeout.tv_sec = 2;
 	sched.default_timeout.tv_usec = 999 * 1000;
 	ret = schedule(&sched);