X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=ao_write.c;h=82d98f3ee8cf6c0491e1820ee32b63c8216abac2;hp=bb60e191f4ddb748bbc80aa683c7c8d79fe68122;hb=06d0c50525fc14e8127916481a74c14a2f7098af;hpb=a24d175e6d093d6d9f6e583c3026e45924bad621 diff --git a/ao_write.c b/ao_write.c index bb60e191..82d98f3e 100644 --- a/ao_write.c +++ b/ao_write.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Andre Noll + * Copyright (C) 2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -9,7 +9,6 @@ #include #include #include -#include #include "para.h" #include "fd.h" @@ -29,6 +28,7 @@ struct private_aow_data { pthread_t thread; pthread_attr_t attr; + /* The mutex and the condition variable serialize access to ->btrn */ pthread_mutex_t mutex; pthread_cond_t data_available; struct btr_node *thread_btrn; @@ -40,19 +40,46 @@ static void aow_close(struct writer_node *wn) if (!pawd) return; + assert(!pawd->thread_btrn); ao_close(pawd->dev); free(pawd); wn->private_data = NULL; - ao_shutdown(); } -static void aow_pre_select(struct sched *s, struct task *t) +static void aow_pre_select(struct sched *s, void *context) { - struct writer_node *wn = container_of(t, struct writer_node, task); - int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); + struct writer_node *wn = context; + struct private_aow_data *pawd = wn->private_data; + int ret; - if (ret == 0) - return; + if (!pawd) { /* not yet started */ + assert(wn->btrn); + ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); + if (ret != 0) + goto min_delay; + return; /* no data available */ + } + if (!wn->btrn) { /* EOF */ + if (!pawd->thread_btrn) /* ready to exit */ + goto min_delay; + /* wait for the play thread to terminate */ + goto timeout; + } + pthread_mutex_lock(&pawd->mutex); + ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); + pthread_mutex_unlock(&pawd->mutex); + if (ret != 0) + goto min_delay; + /* + * Even though the node status is zero, we might have data available, + * but the output buffer is full. If we don't set a timeout here, we + * are woken up only if new data arrives, which might be too late and + * result in a buffer underrun in the playing thread. To avoid this we + * never sleep longer than the (default) buffer time. + */ +timeout: + return sched_request_timeout_ms(20, s); +min_delay: sched_min_delay(s); } @@ -130,7 +157,6 @@ static int aow_init(struct writer_node *wn, unsigned sample_rate, struct private_aow_data *pawd = para_malloc(sizeof(*pawd)); struct ao_write_args_info *conf = wn->conf; - ao_initialize(); if (conf->driver_given) { ret = -E_AO_BAD_DRIVER; id = ao_driver_id(conf->driver_arg); @@ -193,16 +219,12 @@ __noreturn static void *aow_play(void *priv) char *data; int ret; + pthread_mutex_lock(&pawd->mutex); for (;;) { - /* - * Lock mutex and wait for signal. pthread_cond_wait() will - * automatically and atomically unlock mutex while it waits. - */ - pthread_mutex_lock(&pawd->mutex); for (;;) { ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); if (ret < 0) - goto unlock; + goto fail; if (ret > 0) { btr_merge(btrn, wn->min_iqs); bytes = btr_next_buffer(btrn, &data); @@ -211,26 +233,35 @@ __noreturn static void *aow_play(void *priv) break; /* eof and less than a single frame available */ ret = -E_WRITE_COMMON_EOF; - goto unlock; + goto fail; } - //PARA_CRIT_LOG("waiting for data\n"); - //usleep(1000); - //pthread_mutex_unlock(&pawd->mutex); - pthread_cond_wait(&pawd->data_available, &pawd->mutex); + /* + * No data available, go to sleep and wait for the main + * thread to wake us up. pthread_cond_wait() unlocks + * the mutex while it waits and locks it again upon + * return. + */ + ret = pthread_cond_wait(&pawd->data_available, + &pawd->mutex); + /* pthread_cond_wait() can never fail here */ + assert(ret == 0); } - pthread_mutex_unlock(&pawd->mutex); assert(frames > 0); bytes = frames * pawd->bytes_per_frame; - ret = -E_AO_PLAY; - if (ao_play(pawd->dev, data, bytes) == 0) /* failure */ - goto out; + pthread_mutex_unlock(&pawd->mutex); + ret = ao_play(pawd->dev, data, bytes); + pthread_mutex_lock(&pawd->mutex); + if (ret == 0) { /* failure */ + ret = -E_AO_PLAY; + goto fail; + } btr_consume(btrn, bytes); } -unlock: - pthread_mutex_unlock(&pawd->mutex); -out: +fail: + btr_remove_node(&pawd->thread_btrn); assert(ret < 0); PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + pthread_mutex_unlock(&pawd->mutex); pthread_exit(NULL); } @@ -277,11 +308,9 @@ fail: return -E_AO_PTHREAD; } -static void aow_post_select(__a_unused struct sched *s, - struct task *t) +static int aow_post_select(__a_unused struct sched *s, void *context) { - struct writer_node *wn = container_of(t, struct writer_node, task); - struct btr_node *btrn = wn->btrn; + struct writer_node *wn = context; struct private_aow_data *pawd = wn->private_data; int ret; @@ -289,14 +318,14 @@ static void aow_post_select(__a_unused struct sched *s, int32_t rate, ch, format; struct btr_node_description bnd; - ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); + ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); if (ret < 0) goto remove_btrn; if (ret == 0) - return; - get_btr_sample_rate(btrn, &rate); - get_btr_channels(btrn, &ch); - get_btr_sample_format(btrn, &format); + return 0; + get_btr_sample_rate(wn->btrn, &rate); + get_btr_channels(wn->btrn, &ch); + get_btr_sample_format(wn->btrn, &format); ret = aow_init(wn, rate, ch, format); if (ret < 0) goto remove_btrn; @@ -304,7 +333,7 @@ static void aow_post_select(__a_unused struct sched *s, /* set up thread btr node */ bnd.name = "ao_thread_btrn"; - bnd.parent = btrn; + bnd.parent = wn->btrn; bnd.child = NULL; bnd.handler = NULL; bnd.context = pawd; @@ -314,46 +343,54 @@ static void aow_post_select(__a_unused struct sched *s, ret = aow_create_thread(wn); if (ret < 0) goto remove_thread_btrn; - return; + return 0; + } + if (!wn->btrn) { + if (!pawd->thread_btrn) { + pthread_join(pawd->thread, NULL); + return -E_AO_EOF; + } + PARA_INFO_LOG("waiting for play thread to terminate\n"); + return 0; } pthread_mutex_lock(&pawd->mutex); - ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF); + ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF); if (ret > 0) { - btr_pushdown(btrn); - pthread_cond_signal(&pawd->data_available); + btr_pushdown(wn->btrn); + if (pthread_cond_signal(&pawd->data_available) != 0) { + ret = -E_AO_PTHREAD; + PARA_ERROR_LOG("pthread_cond_signal() failed\n"); + goto remove_thread_btrn; + } } - pthread_mutex_unlock(&pawd->mutex); - if (ret >= 0) + if (ret >= 0) { + pthread_mutex_unlock(&pawd->mutex); goto out; - pthread_mutex_lock(&pawd->mutex); - btr_remove_node(btrn); - btrn = NULL; - PARA_INFO_LOG("waiting for thread to terminate\n"); + } + btr_remove_node(&wn->btrn); pthread_cond_signal(&pawd->data_available); pthread_mutex_unlock(&pawd->mutex); - pthread_join(pawd->thread, NULL); + return 0; remove_thread_btrn: - btr_remove_node(pawd->thread_btrn); - btr_free_node(pawd->thread_btrn); + btr_remove_node(&pawd->thread_btrn); remove_btrn: - if (btrn) - btr_remove_node(btrn); + btr_remove_node(&wn->btrn); out: - t->error = ret; + return ret; } -__malloc static void *aow_parse_config_or_die(const char *options) +__malloc static void *aow_parse_config_or_die(int argc, char **argv) { struct ao_write_args_info *conf = para_calloc(sizeof(*conf)); /* exits on errors */ - ao_cmdline_parser_string(options, conf, "ao_write"); + ao_write_cmdline_parser(argc, argv, conf); return conf; } static void aow_free_config(void *conf) { - ao_cmdline_parser_free(conf); + ao_write_cmdline_parser_free(conf); } /** @@ -370,16 +407,13 @@ void ao_write_init(struct writer *w) ao_info **driver_list; char **dh; /* detailed help */ - ao_cmdline_parser_init(&dummy); + ao_write_cmdline_parser_init(&dummy); w->close = aow_close; w->pre_select = aow_pre_select; w->post_select = aow_post_select; w->parse_config_or_die = aow_parse_config_or_die; w->free_config = aow_free_config; - w->shutdown = NULL; - w->help = (struct ggo_help) { - .short_help = ao_write_args_info_help, - }; + w->help = (struct ggo_help)DEFINE_GGO_HELP(ao_write); /* create detailed help containing all supported drivers/options */ for (i = 0; ao_write_args_info_detailed_help[i]; i++) ; /* nothing */ @@ -417,7 +451,6 @@ void ao_write_init(struct writer *w) } dh[num_lines] = NULL; w->help.detailed_help = (const char **)dh; - ao_cmdline_parser_free(&dummy); - ao_shutdown(); + ao_write_cmdline_parser_free(&dummy); }