X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=0d8745d725bce902419afdd17c50a58cf51dd7fc;hp=bd7bb5b1ac704357e3639ebbe4716bf495797404;hb=b99f2c1074bb0786c389830fc5c4db93a61a1dcc;hpb=2742af12a1a8cd99302f60521efe47cfbf16e963 diff --git a/audiod.c b/audiod.c index bd7bb5b1..0d8745d7 100644 --- a/audiod.c +++ b/audiod.c @@ -83,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 */ @@ -472,7 +468,7 @@ 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); @@ -494,18 +490,6 @@ static void kill_all_decoders(void) } } -static void check_sigchld(void) -{ - pid_t pid; - -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; @@ -517,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; @@ -564,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); } @@ -580,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); @@ -661,21 +650,11 @@ 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 open_writer(int slot_num) +static void open_writers(int slot_num) { int ret, i; struct slot_info *s = &slot[slot_num]; @@ -700,7 +679,7 @@ static void open_writer(int slot_num) 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; @@ -708,7 +687,7 @@ static void open_writer(int slot_num) 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)); @@ -727,8 +706,6 @@ static void open_receiver(int format) clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num)); s = &slot[slot_num]; s->format = format; - s->rtime = *now; - s->wtime = s->rtime; s->receiver_node = para_calloc(sizeof(struct receiver_node)); rn = s->receiver_node; rn->receiver = a->receiver; @@ -744,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; @@ -865,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: @@ -875,37 +856,21 @@ static void handle_signal(int sig) } } -static void check_timeouts(void) -{ - - int slot_num, timeout = conf.stream_timeout_arg; - - 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); @@ -921,32 +886,24 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t) kill_all_decoders(); else if (playing) open_current_receiver(); - check_timeouts(); 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) { open_filters(i); - open_writer(i); + open_writers(i); } } } static void audiod_post_select(struct sched *s, __a_unused struct task *t) { - int i; - + /* only save away the current time for other users */ now = &s->now; - FOR_EACH_SLOT(i) { - struct receiver_node *rn = slot[i].receiver_node; - - if (rn && rn->loaded) - slot[i].rtime = *now; - } } static void init_audiod_task(struct audiod_task *at) @@ -990,41 +947,6 @@ static int add_filter(int format, char *cmdline) return filter_num; } -static int setup_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; - /* 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_writers(void) { int i, ret, nw; @@ -1033,7 +955,7 @@ static int init_writers(void) 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 *)); @@ -1053,7 +975,7 @@ static int init_writers(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]); @@ -1111,19 +1033,52 @@ out: free(cmd); 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, ':'); @@ -1139,7 +1094,7 @@ static int init_filters(void) if (ret < 0) goto out; } - ret = 1; + ret = init_default_filters(); /* use default values for the rest */ out: return ret; } @@ -1533,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; @@ -1570,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';