X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=2367d9cb443ecc1d0f52f64e31f76a731b13c8b4;hp=295787262ae66589ceb6dc2d56da258e77943ef8;hb=70677862e5548461918ce42af206cdca61dc250f;hpb=ef1f130a1f9ac61a51da10ee56c5bd9ef1b52366 diff --git a/audiod.c b/audiod.c index 29578726..2367d9cb 100644 --- a/audiod.c +++ b/audiod.c @@ -1,14 +1,13 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ -/** \file audiod.c the paraslash's audio daemon */ +/** \file audiod.c The paraslash's audio daemon. */ #include #include #include -#include #include "para.h" #include "error.h" @@ -17,8 +16,8 @@ #include "list.h" #include "sched.h" #include "ggo.h" -#include "recv.h" #include "buffer_tree.h" +#include "recv.h" #include "filter.h" #include "grab_client.h" #include "client.cmdline.h" @@ -39,6 +38,8 @@ INIT_AUDIOD_ERRLISTS; /** define the array containing all supported audio formats */ const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL}; +DEFINE_RECEIVER_ARRAY; + /** Defines how audiod handles one supported audio format. */ struct audio_format_info { /** pointer to the receiver for this audio format */ @@ -78,6 +79,12 @@ enum vss_status_flags { VSS_STATUS_FLAG_PLAYING = 2, }; +/** + * The scheduler instance of para_audiod. + * + * This is needed also in audiod_command.c (for the tasks command), so it can + * not be made static. + */ struct sched sched = {.max_fileno = 0}; /** @@ -245,7 +252,7 @@ char *get_time_string(int slot_num) */ length = stat_task->length_seconds; tmp = &stat_task->server_stream_start; - if (s && s->wns) { /* writer active in this slot */ + if (s && s->wns && s->wns[0].btrn) { /* writer active in this slot */ btr_get_node_start(s->wns[0].btrn, &wstime); if (wstime.tv_sec != 0) { /* writer wrote something */ if (s->server_stream_start.tv_sec == 0) { @@ -262,7 +269,7 @@ char *get_time_string(int slot_num) tv_diff(tmp, &stat_task->sa_time_diff, &sss); else tv_add(tmp, &stat_task->sa_time_diff, &sss); - if (!s || !s->wns) { + if (!s || !s->wns || !s->wns[0].btrn) { struct timeval diff; tv_diff(now, &sss, &diff); seconds = diff.tv_sec + stat_task->offset_seconds; @@ -271,11 +278,14 @@ char *get_time_string(int slot_num) tv_diff(now, &wstime, &wtime); //PARA_CRIT_LOG("offset %d\n", s->offset_seconds); seconds = s->offset_seconds; - btr_get_node_start(s->receiver_node->btrn, &rstime); - ret = tv_diff(&rstime, &sss, &rskip); - if (ret > 0) { /* audiod was started in the middle of the stream */ - tv_add(&wtime, &rskip, &sum); - seconds += sum.tv_sec; + if (s->receiver_node->btrn) { + btr_get_node_start(s->receiver_node->btrn, &rstime); + ret = tv_diff(&rstime, &sss, &rskip); + if (ret > 0) { /* audiod was started in the middle of the stream */ + tv_add(&wtime, &rskip, &sum); + seconds += sum.tv_sec; + } else + seconds += wtime.tv_sec; } else seconds += wtime.tv_sec; out: @@ -333,10 +343,11 @@ static void parse_config_or_die(void) PARA_EMERG_LOG("can not read config file %s\n", config_file); goto err; } - if (ret) + if (ret) { audiod_cmdline_parser_config_file(config_file, &conf, ¶ms); + daemon_set_loglevel(conf.loglevel_arg); + } free(config_file); - daemon_set_loglevel(conf.loglevel_arg); return; err: free(config_file); @@ -373,7 +384,7 @@ static void close_receiver(int slot_num) PARA_NOTICE_LOG("closing %s receiver in slot %d\n", audio_formats[s->format], slot_num); a->receiver->close(s->receiver_node); - btr_free_node(s->receiver_node->btrn); + btr_remove_node(&s->receiver_node->btrn); free(s->receiver_node); s->receiver_node = NULL; tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000), @@ -389,7 +400,7 @@ static void writer_cleanup(struct writer_node *wn) w = writers + wn->writer_num; PARA_INFO_LOG("closing %s\n", writer_names[wn->writer_num]); w->close(wn); - btr_free_node(wn->btrn); + btr_remove_node(&wn->btrn); } static void close_writers(struct slot_info *s) @@ -417,7 +428,7 @@ static void close_filters(struct slot_info *s) struct audio_format_info *a = afi + s->format; if (a->num_filters == 0) return; - for (i = 0; i < a->num_filters; i++) { + for (i = a->num_filters - 1; i >= 0; i--) { struct filter_node *fn = s->fns + i; struct filter *f; @@ -426,27 +437,13 @@ static void close_filters(struct slot_info *s) f = filters + fn->filter_num; if (f->close) f->close(fn); - btr_free_node(fn->btrn); + btr_remove_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) +static void notify_receivers(int error) { int i; @@ -456,8 +453,7 @@ static void kill_all_decoders(int error) continue; if (!s->receiver_node) continue; - kill_btrn(s->receiver_node->btrn, &s->receiver_node->task, - error); + task_notify(&s->receiver_node->task, error); } } @@ -501,7 +497,6 @@ 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(&(struct btr_node_description) EMBRACE(.name = f->name, .parent = parent, .handler = f->execute, .context = fn)); @@ -525,12 +520,13 @@ static void open_writers(struct slot_info *s) assert(s->wns == NULL); s->wns = para_calloc(PARA_MAX(1U, a->num_writers) * sizeof(struct writer_node)); - PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]); for (i = 0; i < a->num_writers; i++) { wn = s->wns + i; wn->conf = a->writer_conf[i]; wn->writer_num = a->writer_nums[i]; register_writer_node(wn, parent, &sched); + PARA_NOTICE_LOG("%s writer started in slot %d\n", + writer_names[a->writer_nums[i]], (int)(s - slot)); } } @@ -555,7 +551,7 @@ static int open_receiver(int format) EMBRACE(.name = r->name, .context = rn)); ret = r->open(rn); if (ret < 0) { - btr_free_node(rn->btrn); + btr_remove_node(&rn->btrn); free(rn); return ret; } @@ -798,17 +794,19 @@ static int parse_writer_args(void) } /* Use default writer for audio formats which are not yet set up. */ FOR_EACH_AUDIO_FORMAT(i) { - struct writer *w = writers + DEFAULT_WRITER; + void *writer_conf; + int writer_num; a = afi + i; if (a->num_writers > 0) continue; /* already set up */ - PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i], - writer_names[DEFAULT_WRITER]); + writer_conf = check_writer_arg_or_die(NULL, &writer_num); a->writer_nums = para_malloc(sizeof(int)); - a->writer_nums[0] = DEFAULT_WRITER; + a->writer_nums[0] = writer_num; a->writer_conf = para_malloc(sizeof(void *)); - a->writer_conf[0] = w->parse_config_or_die(""); + a->writer_conf[0] = writer_conf; a->num_writers = 1; + PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i], + writer_names[writer_num]); } return 1; } @@ -917,23 +915,26 @@ out: static int parse_filter_args(void) { - int i, j, ret, af_mask; + int i, j, ret, af_mask, num_matches; - if (!conf.no_default_filters_given) - return init_default_filters(); for (i = 0; i < conf.filter_given; i++) { char *arg; ret = parse_stream_command(conf.filter_arg[i], &arg); if (ret < 0) goto out; af_mask = ret; + num_matches = 0; FOR_EACH_AUDIO_FORMAT(j) { if ((af_mask & (1 << j)) == 0) /* no match */ continue; ret = add_filter(j, arg); if (ret < 0) goto out; + num_matches++; } + if (num_matches == 0) + PARA_WARNING_LOG("ignoring filter spec: %s\n", + conf.filter_arg[i]); } ret = init_default_filters(); /* use default values for the rest */ out: @@ -997,7 +998,7 @@ static void signal_pre_select(struct sched *s, struct task *t) para_fd_set(st->fd, &s->rfds, &s->max_fileno); } -static void signal_post_select(struct sched *s, __a_unused struct task *t) +static int signal_post_select(struct sched *s, __a_unused struct task *t) { int signum; @@ -1009,6 +1010,7 @@ static void signal_post_select(struct sched *s, __a_unused struct task *t) PARA_EMERG_LOG("terminating on signal %d\n", signum); clean_exit(EXIT_FAILURE, "caught deadly signal"); } + return 0; } static void signal_setup_default(struct signal_task *st) @@ -1024,7 +1026,7 @@ static void command_pre_select(struct sched *s, struct task *t) para_fd_set(ct->fd, &s->rfds, &s->max_fileno); } -static void command_post_select(struct sched *s, struct task *t) +static int command_post_select(struct sched *s, struct task *t) { int ret; struct command_task *ct = container_of(t, struct command_task, task); @@ -1041,6 +1043,7 @@ static void command_post_select(struct sched *s, struct task *t) if (ret < 0) PARA_ERROR_LOG("%s\n", para_strerror(-ret)); audiod_status_dump(); + return 0; } static void init_command_task(struct command_task *ct) @@ -1066,27 +1069,6 @@ static void close_stat_pipe(void) audiod_status_dump(); } -/** - * close the connection to para_server and exit - * - * \param status the exit status which is passed to exit(3) - * \param msg the log message - * - * Log \a msg with loglevel \p EMERG, close the connection to para_server if - * open, and call \p exit(status). \a status should be either EXIT_SUCCESS or - * EXIT_FAILURE. - * - * \sa exit(3) - */ -void __noreturn clean_exit(int status, const char *msg) -{ - PARA_EMERG_LOG("%s\n", msg); - if (socket_name) - unlink(socket_name); - close_stat_pipe(); - exit(status); -} - /* avoid busy loop if server is down */ static void set_stat_task_restart_barrier(unsigned seconds) { @@ -1094,27 +1076,34 @@ 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) +static bool must_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; + return false; if (s->receiver_node && s->receiver_node->task.error >= 0) - return; + return false; for (i = 0; i < a->num_filters; i++) if (s->fns && s->fns[i].task.error >= 0) - return; + return false; if (a->num_writers > 0) { for (i = 0; i < a->num_writers; i++) if (s->wns && s->wns[i].task.error >= 0) - return; + return false; } else { if (s->wns && s->wns[0].task.error >= 0) - return; + return false; } + return true; +} + +static void close_slot(int slot_num) +{ + struct slot_info *s = slot + slot_num; + PARA_INFO_LOG("closing slot %d\n", slot_num); close_writers(s); close_filters(s); @@ -1122,21 +1111,55 @@ static void try_to_close_slot(int slot_num) clear_slot(slot_num); } +static void close_unused_slots(void) +{ + int i; + + FOR_EACH_SLOT(i) + if (must_close_slot(i)) + close_slot(i); +} + +/** + * Close the connection to para_server and exit. + * + * \param status The exit status which is passed to exit(3). + * \param msg The log message + * + * Log \a msg with loglevel \p EMERG, close the connection to para_server and + * all slots, and call \p exit(status). \a status should be either EXIT_SUCCESS + * or EXIT_FAILURE. + * + * \sa exit(3). + */ +void __noreturn clean_exit(int status, const char *msg) +{ + int i; + + PARA_EMERG_LOG("%s\n", msg); + if (socket_name) + unlink(socket_name); + close_stat_pipe(); + FOR_EACH_SLOT(i) + close_slot(i); + audiod_cmdline_parser_free(&conf); + exit(status); +} + /* * Check if any receivers/filters/writers need to be started and do so if * necessary. */ static void start_stop_decoders(void) { - int i, ret; + int ret; struct slot_info *sl; struct audio_format_info *a; - FOR_EACH_SLOT(i) - try_to_close_slot(i); + close_unused_slots(); if (audiod_status != AUDIOD_ON || !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) - return kill_all_decoders(-E_NOT_PLAYING); + return notify_receivers(E_NOT_PLAYING); if (!must_start_decoder()) return; ret = open_receiver(stat_task->current_audio_format_num); @@ -1156,11 +1179,14 @@ static void start_stop_decoders(void) 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; + int i, 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); + FOR_EACH_SLOT(i) + if (must_close_slot(i)) + goto min_delay; + ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF); if (ret > 0) goto min_delay; if (st->ct && audiod_status == AUDIOD_OFF) @@ -1182,7 +1208,7 @@ min_delay: } /* restart the client task if necessary */ -static void status_post_select(struct sched *s, struct task *t) +static int status_post_select(struct sched *s, struct task *t) { struct status_task *st = container_of(t, struct status_task, task); @@ -1190,11 +1216,9 @@ static void status_post_select(struct sched *s, struct task *t) if (!st->ct) goto out; if (st->ct->task.error >= 0) { - kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF); + task_notify(&st->ct->task, E_AUDIOD_OFF); goto out; } - if (st->ct->task.error >= 0) - goto out; close_stat_pipe(); st->clock_diff_count = conf.clock_diff_count_arg; goto out; @@ -1204,27 +1228,24 @@ static void status_post_select(struct sched *s, struct task *t) size_t sz; int ret; if (st->ct->task.error < 0) { - if (st->ct->task.error >= 0) - goto out; close_stat_pipe(); goto out; } - if (st->ct->status != CL_RECEIVING) + if (st->ct->status != CL_EXECUTING) goto out; ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF); if (ret <= 0) { struct timeval diff; tv_diff(now, &st->last_status_read, &diff); if (diff.tv_sec > 61) - kill_btrn(st->ct->btrn, &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) { - kill_btrn(st->ct->btrn, &st->ct->task, ret); + task_notify(&st->ct->task, -ret); goto out; } if (sz != ret) { @@ -1260,6 +1281,7 @@ static void status_post_select(struct sched *s, struct task *t) st->last_status_read = *now; out: start_stop_decoders(); + return 0; } static void init_status_task(struct status_task *st) @@ -1294,18 +1316,17 @@ static void set_initial_status(void) __noreturn static void print_help_and_die(void) { - int d = conf.detailed_help_given; - const char **p = d? audiod_args_info_detailed_help - : audiod_args_info_help; - - printf_or_die("%s\n\n", AUDIOD_CMDLINE_PARSER_PACKAGE "-" - AUDIOD_CMDLINE_PARSER_VERSION); - printf_or_die("%s\n\n", audiod_args_info_usage); - for (; *p; p++) - printf_or_die("%s\n", *p); - print_receiver_helps(d); - print_filter_helps(d); - print_writer_helps(d); + struct ggo_help h = DEFINE_GGO_HELP(audiod); + bool d = conf.detailed_help_given; + unsigned flags; + + flags = d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS; + ggo_print_help(&h, flags); + + flags = d? GPH_MODULE_FLAGS_DETAILED : GPH_MODULE_FLAGS; + print_receiver_helps(flags); + print_filter_helps(flags); + print_writer_helps(flags); exit(0); } @@ -1344,9 +1365,9 @@ int main(int argc, char *argv[]) }; valid_fd_012(); - if (audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms)) - exit(EXIT_FAILURE); - HANDLE_VERSION_FLAG("audiod", conf); + audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms); + daemon_set_loglevel(conf.loglevel_arg); + version_handle_flag("audiod", conf.version_given); /* init receivers/filters/writers early to make help work */ recv_init(); filter_init();