mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make use of pa_thread_mq everywhere

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1624 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-10 22:02:39 +00:00
parent b3f1a133f1
commit 3eae9038eb
13 changed files with 127 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/modules/module-alsa-sink.c
View file

@ -50,6 +50,7 @@
#include <pulsecore/macro.h>
#include <pulsecore/thread.h>
#include <pulsecore/core-error.h>
#include <pulsecore/thread-mq.h>
#include "alsa-util.h"
#include "module-alsa-sink-symdef.h"
@ -78,7 +79,7 @@ struct userdata {
pa_module *module;
pa_sink *sink;
pa_thread *thread;
pa_asyncmsgq *asyncmsgq;
pa_thread_mq thread_mq;
snd_pcm_t *pcm_handle;
@ -254,7 +255,7 @@ static int build_pollfd(struct userdata *u) {
pa_xfree(u->pollfd);
u->pollfd = pa_xnew0(struct pollfd, POLLFD_ALSA_BASE + u->n_alsa_fds);
u->pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
u->pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->thread_mq.inq);
u->pollfd[POLLFD_ASYNCQ].events = POLLIN;
if ((err = snd_pcm_poll_descriptors(u->pcm_handle, u->pollfd+POLLFD_ALSA_BASE, u->n_alsa_fds)) < 0) {
@ -528,6 +529,8 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up");
pa_thread_mq_install(&u->thread_mq);
if (build_pollfd(u) < 0)
goto fail;
@ -542,18 +545,18 @@ static void thread_func(void *userdata) {
/* pa_log("loop"); */
/* Check whether there is a message for us to process */
if (pa_asyncmsgq_get(u->asyncmsgq, &object, &code, &data, &offset, &chunk, 0) == 0) {
if (pa_asyncmsgq_get(u->thread_mq.inq, &object, &code, &data, &offset, &chunk, 0) == 0) {
int ret;
/* pa_log("processing msg"); */
if (!object && code == PA_MESSAGE_SHUTDOWN) {
pa_asyncmsgq_done(u->asyncmsgq, 0);
pa_asyncmsgq_done(u->thread_mq.inq, 0);
goto finish;
}
ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk);
pa_asyncmsgq_done(u->asyncmsgq, ret);
pa_asyncmsgq_done(u->thread_mq.inq, ret);
continue;
}
@ -649,14 +652,14 @@ static void thread_func(void *userdata) {
}
/* Hmm, nothing to do. Let's sleep */
if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
if (pa_asyncmsgq_before_poll(u->thread_mq.inq) < 0)
continue;
/* pa_log("polling for %i", POLLFD_ALSA_BASE + (PA_SINK_OPENED(u->sink->thread_info.state) ? u->n_alsa_fds : 0)); */
r = poll(u->pollfd, POLLFD_ALSA_BASE + (PA_SINK_OPENED(u->sink->thread_info.state) ? u->n_alsa_fds : 0), -1);
/* pa_log("poll end"); */
pa_asyncmsgq_after_poll(u->asyncmsgq);
pa_asyncmsgq_after_poll(u->thread_mq.inq);
if (r < 0) {
if (errno == EINTR) {
@ -697,8 +700,8 @@ static void thread_func(void *userdata) {
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, 0, NULL, NULL);
pa_asyncmsgq_wait_for(u->asyncmsgq, 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");
@ -762,7 +765,7 @@ int pa__init(pa_module*m) {
u->first = 1;
u->n_alsa_fds = 0;
u->pollfd = NULL;
pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
snd_config_update_free_global();
if ((err = snd_pcm_open(&u->pcm_handle, dev = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK)) < 0) {
@ -835,7 +838,7 @@ int pa__init(pa_module*m) {
u->sink->userdata = u;
pa_sink_set_module(u->sink, m);
pa_sink_set_asyncmsgq(u->sink, u->asyncmsgq);
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_description(u->sink, t = pa_sprintf_malloc(
"ALSA PCM on %s (%s)",
dev,
@ -933,13 +936,12 @@ void pa__done(pa_module*m) {
pa_sink_disconnect(u->sink);
if (u->thread) {
pa_asyncmsgq_send(u->asyncmsgq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, 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->sink)
pa_sink_unref(u->sink);