X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/fff9081c4bedded92caaabf9191aeb717709354b..8c0cca79058c2e669a6b02ea503514926e795981:/src/modules/module-pipe-source.c diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c index 5dbb1e7b..a941f088 100644 --- a/src/modules/module-pipe-source.c +++ b/src/modules/module-pipe-source.c @@ -1,5 +1,3 @@ -/* $Id$ */ - /*** This file is part of PulseAudio. @@ -7,7 +5,7 @@ PulseAudio is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2 of the License, + by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. PulseAudio is distributed in the hope that it will be useful, but @@ -29,11 +27,13 @@ #include #include #include -#include #include #include -#include -#include +#include + +#ifdef HAVE_SYS_FILIO_H +#include +#endif #include @@ -44,19 +44,24 @@ #include #include #include +#include +#include +#include #include "module-pipe-source-symdef.h" -PA_MODULE_AUTHOR("Lennart Poettering") -PA_MODULE_DESCRIPTION("UNIX pipe source") -PA_MODULE_VERSION(PACKAGE_VERSION) +PA_MODULE_AUTHOR("Lennart Poettering"); +PA_MODULE_DESCRIPTION("UNIX pipe source"); +PA_MODULE_VERSION(PACKAGE_VERSION); +PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_USAGE( "source_name= " + "source_properties= " "file= " "format= " - "channels= " "rate= " - "channel_map=") + "channels= " + "channel_map="); #define DEFAULT_FILE_NAME "/tmp/music.input" #define DEFAULT_SOURCE_NAME "fifo_input" @@ -65,75 +70,82 @@ struct userdata { pa_core *core; pa_module *module; pa_source *source; + pa_thread *thread; - pa_asyncmsgq *asyncmsgq; - + pa_thread_mq thread_mq; + pa_rtpoll *rtpoll; + char *filename; int fd; pa_memchunk memchunk; + + pa_rtpoll_item *rtpoll_item; }; static const char* const valid_modargs[] = { + "source_name", + "source_properties", "file", + "format", "rate", "channels", - "format", - "source_name", "channel_map", NULL }; +static int source_process_msg( + pa_msgobject *o, + int code, + void *data, + int64_t offset, + pa_memchunk *chunk) { + + struct userdata *u = PA_SOURCE(o)->userdata; + + switch (code) { + + case PA_SOURCE_MESSAGE_GET_LATENCY: { + size_t n = 0; + +#ifdef FIONREAD + int l; + + if (ioctl(u->fd, FIONREAD, &l) >= 0 && l > 0) + n = (size_t) l; +#endif + + *((pa_usec_t*) data) = pa_bytes_to_usec(n, &u->source->sample_spec); + return 0; + } + } + + return pa_source_process_msg(o, code, data, offset, chunk); +} + static void thread_func(void *userdata) { - enum { - POLLFD_ASYNCQ, - POLLFD_FIFO, - POLLFD_MAX, - }; - struct userdata *u = userdata; - struct pollfd pollfd[POLLFD_MAX]; int read_type = 0; pa_assert(u); pa_log_debug("Thread starting up"); - memset(&pollfd, 0, sizeof(pollfd)); - - pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq); - pollfd[POLLFD_ASYNCQ].events = POLLIN; - pollfd[POLLFD_FIFO].fd = u->fd; + pa_thread_mq_install(&u->thread_mq); for (;;) { - pa_msgobject *object; - int code; - void *data; - pa_memchunk chunk; - int r; - - /* Check whether there is a message for us to process */ - if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &chunk, 0) == 0) { - int ret; - - if (!object && code == PA_MESSAGE_SHUTDOWN) { - pa_asyncmsgq_done(u->asyncmsgq, 0); - goto finish; - } + int ret; + struct pollfd *pollfd; - ret = pa_asyncmsgq_dispatch(object, code, data, &chunk); - pa_asyncmsgq_done(u->asyncmsgq, ret); - continue; - } + pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); /* Try to read some data and pass it on to the source driver */ - - if (u->source->thread_info.state == PA_SOURCE_RUNNING && pollfd[POLLFD_FIFO].revents) { - void *p; + if (u->source->thread_info.state == PA_SOURCE_RUNNING && pollfd->revents) { ssize_t l; + void *p; if (!u->memchunk.memblock) { - u->memchunk.memblock = pa_memblock_new(u->core->mempool, PIPE_BUF); + u->memchunk.memblock = pa_memblock_new(u->core->mempool, pa_pipe_buf(u->fd)); u->memchunk.index = u->memchunk.length = 0; } @@ -150,74 +162,61 @@ static void thread_func(void *userdata) { if (errno == EINTR) continue; else if (errno != EAGAIN) { - pa_log("Faile to read data from FIFO: %s", pa_cstrerror(errno)); + pa_log("Failed to read data from FIFO: %s", pa_cstrerror(errno)); goto fail; } } else { - u->memchunk.length = l; + u->memchunk.length = (size_t) l; pa_source_post(u->source, &u->memchunk); - u->memchunk.index += l; + u->memchunk.index += (size_t) l; if (u->memchunk.index >= pa_memblock_get_length(u->memchunk.memblock)) { pa_memblock_unref(u->memchunk.memblock); pa_memchunk_reset(&u->memchunk); } - pollfd[POLLFD_FIFO].revents = 0; - continue; + pollfd->revents = 0; } } - pollfd[POLLFD_FIFO].events = u->source->thread_info.state == PA_SOURCE_RUNNING ? POLLIN : 0; - /* Hmm, nothing to do. Let's sleep */ + pollfd->events = (short) (u->source->thread_info.state == PA_SOURCE_RUNNING ? POLLIN : 0); - if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0) - continue; - -/* pa_log("polling for %i", pollfd[POLLFD_FIFO].events); */ - r = poll(pollfd, POLLFD_MAX, -1); -/* pa_log("polling got %i (r=%i) %i", r > 0 ? pollfd[POLLFD_FIFO].revents : 0, r, r > 0 ? pollfd[POLLFD_ASYNCQ].revents: 0); */ - - pa_asyncmsgq_after_poll(u->asyncmsgq); + if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) + goto fail; - if (r < 0) { - if (errno == EINTR) - continue; + if (ret == 0) + goto finish; - pa_log("poll() failed: %s", pa_cstrerror(errno)); - goto fail; - } + pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); - if (pollfd[POLLFD_FIFO].revents & ~POLLIN) { + if (pollfd->revents & ~POLLIN) { pa_log("FIFO shutdown."); goto fail; } - - pa_assert((pollfd[POLLFD_ASYNCQ].revents & ~POLLIN) == 0); } fail: - /* We have to continue processing messages until we receive the - * SHUTDOWN message */ - pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, NULL, NULL); - pa_asyncmsgq_wait_for(u->asyncmsgq, PA_MESSAGE_SHUTDOWN); + /* If this was no regular exit from the loop we have to continue + * processing messages until we received PA_MESSAGE_SHUTDOWN */ + pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); + pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN); finish: pa_log_debug("Thread shutting down"); } -int pa__init(pa_core *c, pa_module*m) { +int pa__init(pa_module*m) { struct userdata *u; struct stat st; pa_sample_spec ss; pa_channel_map map; pa_modargs *ma; - char *t; + struct pollfd *pollfd; + pa_source_new_data data; - pa_assert(c); pa_assert(m); if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { @@ -225,30 +224,29 @@ int pa__init(pa_core *c, pa_module*m) { goto fail; } - ss = c->default_sample_spec; + ss = m->core->default_sample_spec; + map = m->core->default_channel_map; if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_DEFAULT) < 0) { pa_log("invalid sample format specification or channel map"); goto fail; } - u = pa_xnew0(struct userdata, 1); - u->core = c; + m->userdata = u = pa_xnew0(struct userdata, 1); + u->core = m->core; u->module = m; - m->userdata = u; pa_memchunk_reset(&u->memchunk); - - pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0)); + u->rtpoll = pa_rtpoll_new(); + pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); + + u->filename = pa_runtime_path(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME)); - u->filename = pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME)); - mkfifo(u->filename, 0666); - if ((u->fd = open(u->filename, O_RDWR|O_NOCTTY)) < 0) { + if ((u->fd = pa_open_cloexec(u->filename, O_RDWR, 0)) < 0) { pa_log("open('%s'): %s", u->filename, pa_cstrerror(errno)); goto fail; } - pa_fd_set_cloexec(u->fd, 1); - pa_make_nonblock_fd(u->fd); + pa_make_fd_nonblock(u->fd); if (fstat(u->fd, &st) < 0) { pa_log("fstat('%s'): %s",u->filename, pa_cstrerror(errno)); @@ -260,23 +258,48 @@ int pa__init(pa_core *c, pa_module*m) { goto fail; } - if (!(u->source = pa_source_new(c, __FILE__, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME), 0, &ss, &map))) { + pa_source_new_data_init(&data); + data.driver = __FILE__; + data.module = m; + pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_STRING, u->filename); + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Unix FIFO source %s", u->filename); + pa_source_new_data_set_sample_spec(&data, &ss); + pa_source_new_data_set_channel_map(&data, &map); + + if (pa_modargs_get_proplist(ma, "source_properties", data.proplist, PA_UPDATE_REPLACE) < 0) { + pa_log("Invalid properties"); + pa_source_new_data_done(&data); + goto fail; + } + + u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY); + pa_source_new_data_done(&data); + + if (!u->source) { pa_log("Failed to create source."); goto fail; } + u->source->parent.process_msg = source_process_msg; u->source->userdata = u; - - pa_source_set_module(u->source, m); - pa_source_set_asyncmsgq(u->source, u->asyncmsgq); - pa_source_set_description(u->source, t = pa_sprintf_malloc("Unix FIFO source '%s'", u->filename)); - pa_xfree(t); - if (!(u->thread = pa_thread_new(thread_func, u))) { + pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); + pa_source_set_rtpoll(u->source, u->rtpoll); + pa_source_set_fixed_latency(u->source, pa_bytes_to_usec(PIPE_BUF, &u->source->sample_spec)); + + u->rtpoll_item = pa_rtpoll_item_new(u->rtpoll, PA_RTPOLL_NEVER, 1); + pollfd = pa_rtpoll_item_get_pollfd(u->rtpoll_item, NULL); + pollfd->fd = u->fd; + pollfd->events = pollfd->revents = 0; + + if (!(u->thread = pa_thread_new("pipe-source", thread_func, u))) { pa_log("Failed to create thread."); goto fail; } + pa_source_put(u->source); + pa_modargs_free(ma); return 0; @@ -285,44 +308,57 @@ fail: if (ma) pa_modargs_free(ma); - pa__done(c, m); + pa__done(m); return -1; } -void pa__done(pa_core *c, pa_module*m) { +int pa__get_n_used(pa_module *m) { struct userdata *u; - - pa_assert(c); + + pa_assert(m); + pa_assert_se(u = m->userdata); + + return pa_source_linked_by(u->source); +} + +void pa__done(pa_module*m) { + struct userdata *u; + pa_assert(m); if (!(u = m->userdata)) return; if (u->source) - pa_source_disconnect(u->source); + pa_source_unlink(u->source); if (u->thread) { - pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, NULL); + pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); pa_thread_free(u->thread); } - if (u->asyncmsgq) - pa_asyncmsgq_free(u->asyncmsgq); + pa_thread_mq_done(&u->thread_mq); if (u->source) pa_source_unref(u->source); - + if (u->memchunk.memblock) pa_memblock_unref(u->memchunk.memblock); + if (u->rtpoll_item) + pa_rtpoll_item_free(u->rtpoll_item); + + if (u->rtpoll) + pa_rtpoll_free(u->rtpoll); + if (u->filename) { unlink(u->filename); pa_xfree(u->filename); } if (u->fd >= 0) - close(u->fd); + pa_assert_se(pa_close(u->fd) == 0); pa_xfree(u); }