X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=f08be183f5e9b64d6c1b8cee29e1567c9fc6fc90;hp=68c84fb4df31bf54266643e709b40918bce53fb7;hb=d46fe38dcada4108ed49a0e621376df0f7913fe3;hpb=3d412f0e603b785291de86be66ff6472cd17246f

diff --git a/audiod.c b/audiod.c
index 68c84fb4..f08be183 100644
--- a/audiod.c
+++ b/audiod.c
@@ -168,10 +168,12 @@ struct audiod_command {
 static int com_grab(int, char *);
 static int com_cycle(int, int, char **);
 static int com_help(int, int, char **);
+static int com_kill(int, int, char **);
 static int com_off(int, int, char **);
 static int com_on(int, int, char **);
 static int com_sb(int, int, char **);
 static int com_stat(int, int, char **);
+static int com_tasks(int, int, char **);
 static int com_term(int, int, char **);
 static struct audiod_command cmds[] = {
 {
@@ -210,6 +212,16 @@ static struct audiod_command cmds[] = {
 "\n"
 "				-- Beatles: Help\n"
 
+},
+{
+.name = "kill",
+.handler = com_kill,
+.description = "kill an active audiod task",
+.synopsis = "kill task_id [task_id ...]",
+.help =
+
+"call sched_unregister() and the event_handler of the given task(s)\n"
+
 },
 {
 .name = "off",
@@ -252,6 +264,16 @@ static struct audiod_command cmds[] = {
 
 "Dump given status items (all if none given) to stdout.\n"
 
+},
+{
+.name = "tasks",
+.handler = com_tasks,
+.description = "list current tasks",
+.synopsis = "tasks",
+.help =
+
+"print the list of task ids together with the status of each task\n"
+
 },
 {
 .name = "term",
@@ -605,6 +627,8 @@ int num_filters(int audio_format_num)
 static void filter_event_handler(struct task *t)
 {
 	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+	struct filter_chain *fc = t->private_data;
+	fc->eof = 1;
 	unregister_task(t);
 }
 
@@ -677,15 +701,10 @@ static struct filter_node *find_filter_node(int slot_num, int format, int filter
 static void wng_event_handler(struct task *t)
 {
 	struct writer_node_group *wng = t->private_data;
-	int i;
 
+	PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
+	wng->eof = 1;
 	wng_unregister(wng);
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		if (s->wng != wng)
-			continue;
-		PARA_INFO_LOG("slot %d: %s\n", i, PARA_STRERROR(-t->ret));
-	}
 }
 
 static void open_writers(int slot_num)
@@ -730,9 +749,11 @@ static void open_writers(int slot_num)
 
 static void rn_event_handler(struct task *t)
 {
-//	struct receiver_node *rn = t->private_data;
+	struct receiver_node *rn = t->private_data;
+
 	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
 	unregister_task(t);
+	rn->eof = 1;
 }
 
 static void open_receiver(int format)
@@ -1226,6 +1247,33 @@ out:
 	return ret;
 }
 
+static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+{
+	char *tl = get_task_list();
+	int ret = 1;
+	if (tl)
+		ret = client_write(fd, tl);
+	free(tl);
+	if (ret > 0)
+		close(fd);
+	return ret;
+}
+
+static int com_kill(int fd, int argc, char **argv)
+{
+	int i, ret = 1;
+	if (argc < 2)
+		return -E_AUDIOD_SYNTAX;
+	for (i = 1; i < argc; i++) {
+		ret = kill_task(argv[i]);
+		if (ret < 0)
+			break;
+	}
+	if (ret > 0)
+		close(fd);
+	return ret;
+}
+
 static int com_stat(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	int i, ret;
@@ -1492,7 +1540,11 @@ static int open_stat_pipe(void)
 void signal_event_handler(struct task *t)
 {
 	struct signal_task *st = t->private_data;
-	handle_signal(st->signum);
+
+	if (t->ret != -E_SIGNAL_CAUGHT)
+		PARA_ERROR_LOG("%s (ignored)\n", PARA_STRERROR(-t->ret));
+	else
+		handle_signal(st->signum);
 }
 
 void signal_pre_select(struct sched *s, struct task *t)
@@ -1555,6 +1607,16 @@ static void init_command_task(struct command_task *ct)
 	sprintf(ct->task.status, "command task");
 }
 
+static void status_event_handler(__a_unused struct task *t)
+{
+	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+	close_stat_pipe();
+	/* avoid busy loop if server is down */
+	while (sleep(1) > 0) /* FIXME */
+		; /* try again*/
+
+}
+
 static void status_pre_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = t->private_data;
@@ -1573,29 +1635,26 @@ static void status_pre_select(struct sched *s, struct task *t)
 static void status_post_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = t->private_data;
-	int ret;
 
 	t->ret = 1;
 	if (st->fd < 0 || !FD_ISSET(st->fd, &s->rfds))
 		return;
-	ret = read(st->fd, st->buf + st->loaded,
-		STRINGSIZE - 1 - st->loaded);
-	if (ret <= 0) {
-		close_stat_pipe();
-		/* avoid busy loop if server is down */
-		while (sleep(1) > 0) /* FIXME */
-			; /* try again*/
-	} else {
-		st->buf[ret + st->loaded] = '\0';
-		st->loaded = for_each_line(st->buf, ret + st->loaded,
-			&check_stat_line);
+	t->ret = read(st->fd, st->buf + st->loaded, STRINGSIZE - 1 - st->loaded);
+	if (t->ret <= 0) {
+		if (!t->ret)
+			t->ret = -E_STATUS_EOF;
+		return;
 	}
+	st->buf[t->ret + st->loaded] = '\0';
+	st->loaded = for_each_line(st->buf, t->ret + st->loaded,
+		&check_stat_line);
 }
 
 static void init_status_task(struct status_task *st)
 {
 	st->task.pre_select = status_pre_select;
 	st->task.post_select = status_post_select;
+	st->task.event_handler = status_event_handler;
 	st->task.private_data = st;
 	st->task.flags = 0;
 	st->loaded = 0;