X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=0d8745d725bce902419afdd17c50a58cf51dd7fc;hb=b99f2c1074bb0786c389830fc5c4db93a61a1dcc;hp=5e8cf2bccdeda933f10a291f3f176c62aeca7640;hpb=bdbc160e9444faa1d236d69a8315f31acf910084;p=paraslash.git diff --git a/audiod.c b/audiod.c index 5e8cf2bc..0d8745d7 100644 --- a/audiod.c +++ b/audiod.c @@ -18,7 +18,6 @@ /** \file audiod.c the paraslash's audio daemon */ -#include /* gettimeofday */ #include "para.h" #include "audiod.cmdline.h" @@ -84,10 +83,6 @@ struct audio_format_info { struct slot_info { /** number of the audio format in this slot */ int format; - /** time of the last successful read from the receiver */ - struct timeval rtime; - /** time the last write to the write fd happend */ - struct timeval wtime; /** writer start time */ struct timeval wstime; /** the receiver info associated with this slot */ @@ -111,8 +106,8 @@ static char *af_status, /* the audio format announced in server status */ static char *stat_item_values[NUM_STAT_ITEMS]; static FILE *logfile; static const struct timeval restart_delay = {0, 300 * 1000}; - static struct audio_format_info afi[NUM_AUDIO_FORMATS]; +static struct timeval *now; static struct signal_task signal_task_struct, *sig_task = &signal_task_struct; @@ -315,7 +310,7 @@ static int client_write(int fd, const char *buf) static char *get_time_string(struct timeval *newest_stime) { - struct timeval now, diff, adj_stream_start, tmp; + struct timeval diff, adj_stream_start, tmp; int total = 0, use_server_time = 1; if (!playing) { @@ -339,8 +334,7 @@ static char *get_time_string(struct timeval *newest_stime) use_server_time = 0; } } - gettimeofday(&now, NULL); - tv_diff(&now, &tmp, &diff); + tv_diff(now, &tmp, &diff); total = diff.tv_sec + offset_seconds; if (total > length_seconds) total = length_seconds; @@ -466,17 +460,6 @@ static void clear_slot(int slot_num) s->format = -1; } -static void set_restart_barrier(int format, struct timeval *now) -{ - struct timeval tmp; - - if (now) - tmp = *now; - else - gettimeofday(&tmp, NULL); - tv_add(&tmp, &restart_delay, &afi[format].restart_barrier); -} - static void close_receiver(int slot_num) { struct slot_info *s = &slot[slot_num]; @@ -485,14 +468,15 @@ static void close_receiver(int slot_num) if (s->format < 0 || !s->receiver_node) return; a = &afi[s->format]; - PARA_NOTICE_LOG("closing %s recevier in slot %d (eof = %d)\n", + PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n", audio_formats[s->format] , slot_num, s->receiver_node->eof); if (!s->receiver_node->eof) unregister_task(&s->receiver_node->task); a->receiver->close(s->receiver_node); free(s->receiver_node); s->receiver_node = NULL; - set_restart_barrier(s->format, NULL); + /* set restart barrier */ + tv_add(now, &restart_delay, &afi[s->format].restart_barrier); } static void kill_all_decoders(void) @@ -506,20 +490,6 @@ static void kill_all_decoders(void) } } -static void check_sigchld(void) -{ - pid_t pid; - struct timeval now; - gettimeofday(&now, NULL); - -reap_next_child: - pid = para_reap_child(); - if (pid <= 0) - return; - PARA_CRIT_LOG("para_client died (pid %d)\n", pid); - goto reap_next_child; -} - static int get_empty_slot(void) { int i; @@ -531,11 +501,7 @@ static int get_empty_slot(void) clear_slot(i); return i; } - if (s->wng) - continue; - if (s->receiver_node) - continue; - if (s->fc) + if (s->wng || s->receiver_node || s->fc) continue; clear_slot(i); return i; @@ -578,7 +544,8 @@ static void close_stat_pipe(void) offset_seconds = 0; audiod_status_dump(); playing = 0; - stat_item_values[SI_STATUS_BAR] = make_message("%s:no connection to para_server\n", + stat_item_values[SI_STATUS_BAR] = make_message( + "%s:no connection to para_server\n", status_item_list[SI_STATUS_BAR]); stat_client_write(stat_item_values[SI_STATUS_BAR], SI_STATUS_BAR); } @@ -594,13 +561,21 @@ static void __noreturn clean_exit(int status, const char *msg) exit(status); } -/** get the number of filters for the given audio format */ +/** + * get the number of filters + * + * \param audio_format_num the number identifying the audio format + * + * \return the number of filters for the given audio format + * + * \sa struct filter; + */ int num_filters(int audio_format_num) { return afi[audio_format_num].num_filters; } -void filter_event_handler(struct task *t) +static void filter_event_handler(struct task *t) { PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); unregister_task(t); @@ -616,6 +591,7 @@ static void open_filters(int slot_num) s->fc = NULL; if (!nf) return; + PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]); s->fc = para_calloc(sizeof(struct filter_chain)); INIT_LIST_HEAD(&s->fc->filters); s->fc->inbuf = s->receiver_node->buf; @@ -674,28 +650,16 @@ 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 *g = t->private_data; - int i; - PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret)); unregister_task(t); - FOR_EACH_SLOT(i) { - if (slot[i].wng != g) - continue; - wng_close(g); - wng_destroy(g); - slot[i].wng = NULL; - } } -static void start_stream_writer(int slot_num, struct timeval *now) +static void open_writers(int slot_num) { int ret, i; struct slot_info *s = &slot[slot_num]; struct audio_format_info *a = &afi[s->format]; - PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]); - open_filters(slot_num); PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]); if (!a->num_writers) s->wng = setup_default_wng(); @@ -715,7 +679,7 @@ static void start_stream_writer(int slot_num, struct timeval *now) for (i = 0; i < a->num_writers; i++) { s->wng->writer_nodes[i].conf = a->writer_conf[i]; s->wng->writer_nodes[i].writer = a->writers[i]; - sprintf(s->wng->writer_nodes[i].task.status, "writer_ node"); + sprintf(s->wng->writer_nodes[i].task.status, "writer_node"); } ret = wng_open(s->wng); s->wstime = *now; @@ -723,12 +687,13 @@ static void start_stream_writer(int slot_num, struct timeval *now) activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters); } -void rn_event_handler(struct task *t) +static void rn_event_handler(struct task *t) { // struct receiver_node *rn = t->private_data; PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); unregister_task(t); } + static void open_receiver(int format) { struct audio_format_info *a = &afi[format]; @@ -741,8 +706,6 @@ static void open_receiver(int format) clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num)); s = &slot[slot_num]; s->format = format; - gettimeofday(&s->rtime, NULL); - s->wtime = s->rtime; s->receiver_node = para_calloc(sizeof(struct receiver_node)); rn = s->receiver_node; rn->receiver = a->receiver; @@ -758,7 +721,6 @@ static void open_receiver(int format) PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n", audio_formats[s->format], a->receiver->name, slot_num); rn->task.private_data = s->receiver_node; - PARA_NOTICE_LOG("rn = %p\n", rn->task.private_data); rn->task.pre_select = a->receiver->pre_select; rn->task.post_select = a->receiver->post_select; rn->task.event_handler = rn_event_handler; @@ -767,14 +729,14 @@ static void open_receiver(int format) register_task(&rn->task); } -static int is_frozen(int format, struct timeval *now) +static int is_frozen(int format) { struct audio_format_info *a = &afi[format]; return (tv_diff(now, &a->restart_barrier, NULL) > 0)? 0 : 1; } -static void start_current_receiver(struct timeval *now) +static void open_current_receiver(void) { int i; @@ -783,21 +745,20 @@ static void start_current_receiver(struct timeval *now) i = get_audio_format_num(af_status); if (i < 0) return; - if ((decoder_running(i) & 1) || is_frozen(i, now)) + if (decoder_running(i) || is_frozen(i)) return; open_receiver(i); } static void compute_time_diff(const struct timeval *status_time) { - struct timeval now, tmp, diff; + struct timeval tmp, diff; static int count; int sign; const struct timeval max_deviation = {0, 500 * 1000}; const int time_smooth = 5; - gettimeofday(&now, NULL); - sign = tv_diff(status_time, &now, &diff); + sign = tv_diff(status_time, now, &diff); // PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__, // sign, sa_time_diff_sign); if (!count) { @@ -880,7 +841,12 @@ static void handle_signal(int sig) { switch (sig) { case SIGCHLD: - return check_sigchld(); + for (;;) { + pid_t pid = para_reap_child(); + if (pid <= 0) + return; + PARA_CRIT_LOG("para_client died (pid %d)\n", pid); + } case SIGINT: case SIGTERM: case SIGHUP: @@ -890,38 +856,21 @@ static void handle_signal(int sig) } } -static void check_timeouts(void) -{ - struct timeval now; - int slot_num, timeout = conf.stream_timeout_arg; - - gettimeofday(&now, NULL); - FOR_EACH_SLOT(slot_num) { - struct slot_info *s = &slot[slot_num]; - if (s->format < 0) - continue; - /* check read time */ - if (s->receiver_node && - now.tv_sec > s->rtime.tv_sec + timeout) { - PARA_INFO_LOG("%s stream (slot %d) not ready\n", - audio_formats[s->format], slot_num); - s->receiver_node->eof = 1; - } - } -} - -static void close_decoder_if_idle(int slot_num) +static void try_to_close_slot(int slot_num) { struct slot_info *s = &slot[slot_num]; if (s->format < 0) return; - if (!s->fc) + if (s->receiver_node && !s->receiver_node->eof) + return; + if (s->fc && !s->fc->eof) return; - if (s->wng) + if (s->wng && !s->wng->eof) return; - PARA_INFO_LOG("closing all filters in slot %d (filter_chain %p)\n", - slot_num, s->fc); + PARA_INFO_LOG("closing slot %d \n", slot_num); + wng_close(s->wng); + wng_destroy(s->wng); close_filters(s->fc); free(s->fc); close_receiver(slot_num); @@ -932,35 +881,29 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t) { int i; + now = &s->now; if (audiod_status != AUDIOD_ON) kill_all_decoders(); else if (playing) - start_current_receiver(&s->now); - check_timeouts(); + open_current_receiver(); FOR_EACH_SLOT(i) { struct receiver_node *rn; - close_decoder_if_idle(i); + try_to_close_slot(i); if (slot[i].format < 0) continue; rn = slot[i].receiver_node; if (rn && rn->loaded && !slot[i].wng) { - PARA_INFO_LOG("no writer in slot %d\n", i); - start_stream_writer(i, &s->now); + open_filters(i); + open_writers(i); } } } static void audiod_post_select(struct sched *s, __a_unused struct task *t) { - int i; - - FOR_EACH_SLOT(i) { - struct receiver_node *rn = slot[i].receiver_node; - - if (rn && rn->loaded) - slot[i].rtime = s->now; - } + /* only save away the current time for other users */ + now = &s->now; } static void init_audiod_task(struct audiod_task *at) @@ -1004,50 +947,15 @@ static int add_filter(int format, char *cmdline) return filter_num; } -static int setup_default_filters(void) +static int init_writers(void) { - int i, ret = 1; - - FOR_EACH_AUDIO_FORMAT(i) { - struct audio_format_info *a = &afi[i]; - char *tmp; - int j; - if (a->num_filters) - continue; - /* add "dec" to audio format name */ - tmp = make_message("%sdec", audio_formats[i]); - for (j = 0; filters[j].name; j++) - if (!strcmp(tmp, filters[j].name)) - break; - free(tmp); - ret = -E_UNSUPPORTED_FILTER; - if (!filters[j].name) - goto out; - tmp = para_strdup(filters[j].name); - ret = add_filter(i, tmp); - free(tmp); - if (ret < 0) - goto out; - PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i], - filters[j].name); - ret = add_filter(i, "wav"); - if (ret < 0) - goto out; - PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]); - } -out: - return ret; -} - -static int init_stream_io(void) -{ - int i, ret, receiver_num, nf, nw; + int i, ret, nw; char *cmd; struct audio_format_info *a; init_supported_writers(); nw = PARA_MAX(1, conf.writer_given); - PARA_INFO_LOG("allocating space for %d writers\n", nw); + PARA_INFO_LOG("maximal number of writers: %d\n", nw); FOR_EACH_AUDIO_FORMAT(i) { a = &afi[i]; a->writer_conf = para_malloc(nw * sizeof(void *)); @@ -1067,12 +975,23 @@ static int init_stream_io(void) ret = writer_num; goto out; } - a->writers[nw] = &writers[ret]; + a->writers[nw] = &writers[writer_num]; a->writer_conf[nw] = wconf; PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret], nw, writer_names[writer_num]); a->num_writers++; } + ret = 1; +out: + return ret; +} + +static int init_receivers(void) +{ + int i, ret, receiver_num; + char *cmd = NULL; + struct audio_format_info *a; + for (i = 0; receivers[i].name; i++) { PARA_INFO_LOG("initializing %s receiver\n", receivers[i].name); receivers[i].init(&receivers[i]); @@ -1109,17 +1028,57 @@ static int init_stream_io(void) return -E_RECV_SYNTAX; a->receiver = &receivers[receiver_num]; } + ret = 1; +out: free(cmd); - /* filters */ + return ret; +} + +static int init_default_filters(void) +{ + int i, ret = 1; + + FOR_EACH_AUDIO_FORMAT(i) { + struct audio_format_info *a = &afi[i]; + char *tmp; + int j; + + if (a->num_filters) + continue; /* no default -- nothing to to */ + /* add "dec" to audio format name */ + tmp = make_message("%sdec", audio_formats[i]); + for (j = 0; filters[j].name; j++) + if (!strcmp(tmp, filters[j].name)) + break; + free(tmp); + ret = -E_UNSUPPORTED_FILTER; + if (!filters[j].name) + goto out; + tmp = para_strdup(filters[j].name); + ret = add_filter(i, tmp); + free(tmp); + if (ret < 0) + goto out; + PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i], + filters[j].name); + } +out: + return ret; +} + +static int init_filters(void) +{ + int i, ret, nf; + filter_init(filters); - nf = PARA_MAX(2, conf.filter_given) + 1; - PARA_INFO_LOG("allocating space for %d filters\n", nf); + nf = PARA_MAX(1, conf.filter_given); + PARA_INFO_LOG("maximal number of filters: %d\n", nf); FOR_EACH_AUDIO_FORMAT(i) { afi[i].filter_conf = para_malloc(nf * sizeof(void *)); afi[i].filters = para_malloc(nf * sizeof(struct filter *)); } if (!conf.no_default_filters_given) - return setup_default_filters(); + return init_default_filters(); for (i = 0; i < conf.filter_given; i++) { char *arg = conf.filter_arg[i]; char *filter_name = strchr(arg, ':'); @@ -1135,11 +1094,27 @@ static int init_stream_io(void) if (ret < 0) goto out; } - ret = 1; + ret = init_default_filters(); /* use default values for the rest */ out: return ret; } +static int init_stream_io(void) +{ + int ret; + + ret = init_writers(); + if (ret < 0) + return ret; + ret = init_receivers(); + if (ret < 0) + return ret; + ret = init_filters(); + if (ret < 0) + return ret; + return 1; +} + static int dump_commands(int fd) { char *buf = para_strdup(""), *tmp = NULL; @@ -1513,7 +1488,7 @@ static void command_post_select(struct sched *s, struct task *t) PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); } -void init_command_task(struct command_task *ct) +static void init_command_task(struct command_task *ct) { ct->task.pre_select = command_pre_select; ct->task.post_select = command_post_select; @@ -1550,7 +1525,7 @@ static void status_post_select(struct sched *s, struct task *t) if (ret <= 0) { close_stat_pipe(); /* avoid busy loop if server is down */ - while (sleep(1) > 0) + while (sleep(1) > 0) /* FIXME */ ; /* try again*/ } else { st->buf[ret + st->loaded] = '\0';