sched/audiod feature: task list and kill

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 8f6f3560ee37cb6cbb927630bb583937d51693db..f08be183f5e9b64d6c1b8cee29e1567c9fc6fc90 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -105,7 +105,7 @@ static char *af_status, /* the audio format announced in server status */
        *socket_name, *hostname;
 static char *stat_item_values[NUM_STAT_ITEMS];
 static FILE *logfile;
-static const struct timeval restart_delay = {0, 300 * 1000};
+static const struct timeval restart_delay = {0, 200 * 1000};
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
 static struct timeval *now;
 
@@ -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)
@@ -718,7 +737,11 @@ static void open_writers(int slot_num)
                s->wng->writer_nodes[i].writer = a->writers[i];
                sprintf(s->wng->writer_nodes[i].task.status, "writer_node");
        }
-       ret = wng_open(s->wng); /* FIXME */
+       ret = wng_open(s->wng);
+       if (ret < 0) {
+               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               return;
+       }
        s->wstime = *now;
        current_decoder = slot_num;
        activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
@@ -726,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)
@@ -816,7 +841,7 @@ static void compute_time_diff(const struct timeval *status_time)
                count > 10? sign : sign * time_smooth, &diff,
                &tmp);
        sa_time_diff = tmp;
-       PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
+       PARA_DEBUG_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
                sign > 0? "+" : "-",
                tv2ms(&diff),
                sa_time_diff_sign ? "+" : "-",
@@ -1222,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;
@@ -1488,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)
@@ -1551,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;
@@ -1569,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;