X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=d2c66f2bfe5f5bd0d8ba1da88b048ad21d9ceb00;hp=8008e2cb6459f84d3b258bd9efeb0fffc77e4016;hb=484e75562df55dca31ffcb9e5b05a490b4a3d3a1;hpb=4867d9a4948aadde4dd59436e1c5fb0fc141ba89 diff --git a/audiod.c b/audiod.c index 8008e2cb..d2c66f2b 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" @@ -33,11 +32,14 @@ #include "signal.h" #include "version.h" +__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log; /** define the array of error lists needed by para_audiod */ 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 */ @@ -77,6 +79,14 @@ 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}; + /** * The task for obtaining para_server's status (para_client stat). * @@ -242,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) { @@ -259,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; @@ -268,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: @@ -370,7 +383,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), @@ -386,7 +399,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) @@ -423,27 +436,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; @@ -453,8 +452,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); } } @@ -498,13 +496,12 @@ 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)); f->open(fn); - register_task(&fn->task); + register_task(&sched, &fn->task); parent = fn->btrn; PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n", audio_formats[s->format], i, nf, f->name, (int)(s - slot)); @@ -527,7 +524,7 @@ static void open_writers(struct slot_info *s) wn = s->wns + i; wn->conf = a->writer_conf[i]; wn->writer_num = a->writer_nums[i]; - register_writer_node(wn, parent); + register_writer_node(wn, parent, &sched); } } @@ -552,7 +549,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; } @@ -564,7 +561,7 @@ static int open_receiver(int format) rn->task.pre_select = r->pre_select; rn->task.post_select = r->post_select; sprintf(rn->task.status, "%s receiver node", r->name); - register_task(&rn->task); + register_task(&sched, &rn->task); return slot_num; } @@ -795,17 +792,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; } @@ -916,8 +915,6 @@ static int parse_filter_args(void) { int i, j, ret, af_mask; - 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); @@ -994,7 +991,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; @@ -1006,6 +1003,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) @@ -1021,7 +1019,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); @@ -1038,6 +1036,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) @@ -1091,32 +1090,44 @@ 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_unused_slots(void) +{ + int i; + + FOR_EACH_SLOT(i) { + struct slot_info *s = slot + i; + if (!must_close_slot(i)) + continue; + PARA_INFO_LOG("closing slot %d\n", i); + close_writers(s); + close_filters(s); + close_receiver(i); + clear_slot(i); } - PARA_INFO_LOG("closing slot %d\n", slot_num); - close_writers(s); - close_filters(s); - close_receiver(slot_num); - clear_slot(slot_num); } /* @@ -1125,15 +1136,14 @@ static void try_to_close_slot(int slot_num) */ 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); @@ -1146,18 +1156,21 @@ static void start_stop_decoders(void) if (a->num_filters) open_filters(sl); open_writers(sl); - activate_grab_clients(); + activate_grab_clients(&sched); btr_log_tree(sl->receiver_node->btrn, LL_NOTICE); } 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) @@ -1179,7 +1192,7 @@ min_delay: } /* restart the client task if necessary */ -static void status_post_select(__a_unused 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); @@ -1187,11 +1200,9 @@ static void status_post_select(__a_unused 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; @@ -1201,8 +1212,6 @@ static void status_post_select(__a_unused 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; } @@ -1213,15 +1222,14 @@ static void status_post_select(__a_unused struct sched *s, struct task *t) 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_AUDIOD_OFF); 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, E_AUDIOD_OFF); goto out; } if (sz != ret) { @@ -1241,13 +1249,13 @@ static void status_post_select(__a_unused struct sched *s, struct task *t) int argc = 5; PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count); st->clock_diff_count--; - client_open(argc, argv, &st->ct, NULL, NULL, st->btrn); + client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s); set_stat_task_restart_barrier(2); } else { char *argv[] = {"audiod", "--", "stat", "-p", NULL}; int argc = 4; - client_open(argc, argv, &st->ct, NULL, NULL, st->btrn); + client_open(argc, argv, &st->ct, NULL, NULL, st->btrn, s); set_stat_task_restart_barrier(5); } free(stat_item_values[SI_BASENAME]); @@ -1257,6 +1265,7 @@ static void status_post_select(__a_unused 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) @@ -1331,7 +1340,6 @@ static void init_colors_or_die(void) int main(int argc, char *argv[]) { int ret, i; - static struct sched s; struct command_task command_task_struct, *cmd_task = &command_task_struct; struct audiod_cmdline_parser_params params = { .override = 0, @@ -1383,12 +1391,12 @@ int main(int argc, char *argv[]) if (conf.daemon_given) daemonize(false /* parent exits immediately */); - register_task(&sig_task->task); - register_task(&cmd_task->task); - register_task(&stat_task->task); - s.default_timeout.tv_sec = 2; - s.default_timeout.tv_usec = 999 * 1000; - ret = schedule(&s); + register_task(&sched, &sig_task->task); + register_task(&sched, &cmd_task->task); + register_task(&sched, &stat_task->task); + sched.default_timeout.tv_sec = 2; + sched.default_timeout.tv_usec = 999 * 1000; + ret = schedule(&sched); PARA_EMERG_LOG("%s\n", para_strerror(-ret)); return EXIT_FAILURE;