Simplify vss_preselect().
[paraslash.git] / audiod.c
index 615db84..b880eb7 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -7,6 +7,7 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <sys/types.h>
 #include <dirent.h>
+#include <signal.h>
 
 #include "para.h"
 #include "error.h"
@@ -294,7 +295,7 @@ static void open_filters(int slot_num)
                INIT_LIST_HEAD(&fn->callbacks);
                f->open(fn);
                PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
-                       audio_formats[s->format], i + 1,  nf, f->name, slot_num);
+                       audio_formats[s->format], i,  nf, f->name, slot_num);
                s->fc->outbuf = fn->buf;
                s->fc->out_loaded = &fn->loaded;
        }
@@ -338,35 +339,13 @@ static void open_writers(int slot_num)
        activate_inactive_grab_clients(slot_num, s->format, s->fc);
 }
 
-#if 0
-static void rn_event_handler(struct task *t)
-{
-       struct receiver_node *rn = t->private_data;
-       int i;
-
-       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
-       unregister_task(t);
-       rn->error = t->ret;
-       /* set restart barrier */
-       FOR_EACH_SLOT(i) {
-               struct timeval restart_delay = {0, 10 * 1000};
-               if (slot[i].receiver_node != rn)
-                       continue;
-               if (rn->error != -E_RECV_EOF)
-                       /* don't reconnect immediately on errors */
-                       restart_delay.tv_sec = 5;
-               tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier);
-       }
-}
-#endif
-
 static int open_receiver(int format)
 {
        struct audio_format_info *a = &afi[format];
        struct slot_info *s;
        int ret, slot_num;
        struct receiver_node *rn;
-       const struct timeval restart_delay = {1, 0};
+       const struct timeval restart_delay = {2, 0};
 
        ret = get_empty_slot();
        if (ret < 0)
@@ -390,9 +369,10 @@ static int open_receiver(int format)
        rn->task.post_select = a->receiver->post_select;
        sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
        register_task(&rn->task);
-       return 1;
+       ret = 1;
 err:
-       PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        tv_add(now, &restart_delay, &afi[format].restart_barrier);
        return ret;
 }
@@ -533,96 +513,6 @@ static int check_stat_line(char *line, __a_unused void *data)
        return 1;
 }
 
-static void try_to_close_slot(int slot_num)
-{
-       struct slot_info *s = &slot[slot_num];
-
-       if (s->format < 0)
-               return;
-       if (s->receiver_node && s->receiver_node->task.error >= 0)
-               return;
-       if (s->fc && s->fc->task.error >= 0)
-               return;
-       if (s->wng && s->wng->task.error >= 0)
-               return;
-       PARA_INFO_LOG("closing slot %d\n", slot_num);
-       wng_close(s->wng);
-       close_filters(s->fc);
-       free(s->fc);
-       close_receiver(slot_num);
-       clear_slot(slot_num);
-}
-
-/*
- * Check if any receivers/filters/writers need to be started and do so if
- * necessary.  Since the pre_select function didn't have a chance yet to put
- * file descriptors into the fd sets given by s, make the upcoming select()
- * return immediately to avoid a long timeout in case we started something.
- */
-static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
-{
-       int i;
-       struct timeval min_delay = {0, 1};
-
-       if (audiod_status != AUDIOD_ON || !stat_task->playing)
-               return kill_all_decoders(-E_NOT_PLAYING);
-       if (open_current_receiver(s))
-               s->timeout = min_delay;
-       FOR_EACH_SLOT(i) {
-               struct slot_info *sl = &slot[i];
-               struct audio_format_info *a;
-               struct timeval diff;
-
-               if (sl->format < 0)
-                       continue;
-               a = &afi[sl->format];
-               if (!sl->receiver_node)
-                       continue;
-               if ((!a->num_filters || sl->fc) && sl->wng)
-                       continue; /* everything already started */
-               if (!a->num_filters) {
-                       if (sl->receiver_node->loaded && !sl->wng) {
-                               open_writers(i);
-                               s->timeout = min_delay;
-                       }
-                       continue;
-               }
-               if (sl->receiver_node->loaded && !sl->fc) {
-                       open_filters(i);
-                       s->timeout = min_delay;
-                       continue;
-               }
-               if (sl->wng || !sl->fc || !*sl->fc->out_loaded)
-                       continue;
-               if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
-                       open_writers(i);
-                       s->timeout = min_delay;
-                       continue;
-               }
-               PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
-               if (tv_diff(&s->timeout, &diff, NULL) > 0) {
-                       s->timeout = diff;
-               }
-       }
-}
-
-static void audiod_post_select(__a_unused struct sched *s,
-       __a_unused struct task *t)
-{
-       int i;
-
-       FOR_EACH_SLOT(i)
-               try_to_close_slot(i);
-}
-
-static void init_audiod_task(struct task *t)
-{
-       t->pre_select = audiod_pre_select;
-       t->post_select = audiod_post_select;
-       t->error = 0;
-       sprintf(t->status, "audiod task");
-}
-
 static int parse_stream_command(const char *txt, char **cmd)
 {
        char *p = strchr(txt, ':');
@@ -650,7 +540,7 @@ static int add_filter(int format, char *cmdline)
                return filter_num;
        a->filter_nums[nf] = filter_num;
        a->num_filters++;
-       PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf + 1,
+       PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
                filters[filter_num].name);
        return filter_num;
 }
@@ -969,34 +859,103 @@ static void set_stat_task_restart_barrier(unsigned seconds)
        tv_add(now, &delay, &stat_task->restart_barrier);
 }
 
+static void try_to_close_slot(int slot_num)
+{
+       struct slot_info *s = &slot[slot_num];
+
+       if (s->format < 0)
+               return;
+       if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
+               return;
+       if (s->fc && s->fc->task.error != -E_TASK_UNREGISTERED)
+               return;
+       if (s->wng && s->wng->task.error != -E_TASK_UNREGISTERED)
+               return;
+       PARA_INFO_LOG("closing slot %d\n", slot_num);
+       wng_close(s->wng);
+       close_filters(s->fc);
+       free(s->fc);
+       close_receiver(slot_num);
+       clear_slot(slot_num);
+}
+
+/*
+ * Check if any receivers/filters/writers need to be started and do so if
+ * necessary.
+ */
+static void start_stop_decoders(struct sched *s)
+{
+       int i;
+
+       FOR_EACH_SLOT(i)
+               try_to_close_slot(i);
+       if (audiod_status != AUDIOD_ON || !stat_task->playing)
+               return kill_all_decoders(-E_NOT_PLAYING);
+       open_current_receiver(s);
+       FOR_EACH_SLOT(i) {
+               struct slot_info *sl = &slot[i];
+               struct audio_format_info *a;
+               struct timeval diff;
+
+               if (sl->format < 0)
+                       continue;
+               a = &afi[sl->format];
+               if (!sl->receiver_node)
+                       continue;
+               if ((!a->num_filters || sl->fc) && sl->wng)
+                       continue; /* everything already started */
+               if (!a->num_filters) {
+                       if (sl->receiver_node->loaded && !sl->wng) {
+                               open_writers(i);
+                       }
+                       continue;
+               }
+               if (sl->receiver_node->loaded && !sl->fc) {
+                       open_filters(i);
+                       continue;
+               }
+               if (sl->wng || !sl->fc || !*sl->fc->out_loaded)
+                       continue;
+               if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
+                       open_writers(i);
+                       continue;
+               }
+               PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
+               if (tv_diff(&s->timeout, &diff, NULL) > 0) {
+                       s->timeout = diff;
+               }
+       }
+}
+
+
 /* restart the client task if necessary */
-static void status_pre_select(__a_unused struct sched *s, struct task *t)
+static void status_pre_select(struct sched *s, struct task *t)
 {
        struct status_task *st = container_of(t, struct status_task, task);
 
        if (audiod_status == AUDIOD_OFF) {
                if (!st->ct)
-                       return;
+                       goto out;
                if (st->ct->task.error >= 0) {
                        st->ct->task.error = -E_AUDIOD_OFF;
-                       return;
+                       goto out;
                }
                if (st->ct->task.error != -E_TASK_UNREGISTERED)
-                       return;
+                       goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
-               return;
+               goto out;
        }
        if (st->ct) {
                unsigned bytes_left;
                if (st->ct->task.error < 0) {
                        if (st->ct->task.error != -E_TASK_UNREGISTERED)
-                               return;
+                               goto out;
                        close_stat_pipe();
-                       return;
+                       goto out;
                }
                if (st->ct->status != CL_RECEIVING)
-                       return;
+                       goto out;
                bytes_left = for_each_line(st->ct->buf, st->ct->loaded,
                        &check_stat_line, NULL);
                if (st->ct->loaded != bytes_left) {
@@ -1008,10 +967,10 @@ static void status_pre_select(__a_unused struct sched *s, struct task *t)
                        if (diff.tv_sec > 61)
                                st->ct->task.error = -E_STATUS_TIMEOUT;
                }
-               return;
+               goto out;
        }
        if (tv_diff(now, &st->restart_barrier, NULL) < 0)
-               return;
+               goto out;
        if (st->clock_diff_count) { /* get status only one time */
                char *argv[] = {"audiod", "stat", "1", NULL};
                int argc = 3;
@@ -1027,6 +986,8 @@ static void status_pre_select(__a_unused struct sched *s, struct task *t)
                set_stat_task_restart_barrier(5);
        }
        st->last_status_read = *now;
+out:
+       start_stop_decoders(s);
 }
 
 static void init_status_task(struct status_task *st)
@@ -1072,21 +1033,25 @@ int main(int argc, char *argv[])
        int ret, i;
        struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
-       struct task audiod_task_struct, *audiod_task = &audiod_task_struct;
+       struct audiod_cmdline_parser_params params = {
+               .override = 0,
+               .initialize = 1,
+               .check_required = 0,
+               .check_ambiguity = 0,
+               .print_errors = 1
+       };
 
        valid_fd_012();
-       audiod_cmdline_parser(argc, argv, &conf);
+       audiod_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("audiod", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
        config_file = configfile_exists();
        if (config_file) {
-               struct audiod_cmdline_parser_params params = {
-                       .override = 0,
-                       .initialize = 0,
-                       .check_required = 0,
-                       .check_ambiguity = 0
-
-               };
+               params.override = 0;
+               params.initialize = 0;
+               params.check_required = 1;
+               params.check_ambiguity = 0;
+               params.print_errors = 1;
                if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
                        PARA_EMERG_LOG("parse error in config file\n");
                        exit(EXIT_FAILURE);
@@ -1111,7 +1076,6 @@ int main(int argc, char *argv[])
 
        init_status_task(stat_task);
        init_command_task(cmd_task);
-       init_audiod_task(audiod_task);
 
        if (conf.daemon_given)
                daemon_init();
@@ -1119,7 +1083,6 @@ int main(int argc, char *argv[])
        register_task(&sig_task->task);
        register_task(&cmd_task->task);
        register_task(&stat_task->task);
-       register_task(audiod_task);
        s.default_timeout.tv_sec = 0;
        s.default_timeout.tv_usec = 99 * 1000;
        ret = schedule(&s);