summaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/module-alsa-sink.c32
-rw-r--r--src/modules/module-alsa-source.c32
-rw-r--r--src/modules/module-null-sink.c30
-rw-r--r--src/modules/module-oss.c36
-rw-r--r--src/modules/module-pipe-sink.c31
-rw-r--r--src/modules/module-pipe-source.c31
6 files changed, 102 insertions, 90 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c
index 387e70c4..d3fe885d 100644
--- a/src/modules/module-alsa-sink.c
+++ b/src/modules/module-alsa-sink.c
@@ -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);
diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c
index 7ed430e3..55af4735 100644
--- a/src/modules/module-alsa-source.c
+++ b/src/modules/module-alsa-source.c
@@ -51,6 +51,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-source-symdef.h"
@@ -78,7 +79,7 @@ struct userdata {
pa_module *module;
pa_source *source;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
snd_pcm_t *pcm_handle;
@@ -242,7 +243,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) {
@@ -516,6 +517,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;
@@ -530,18 +533,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;
}
@@ -624,14 +627,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_SOURCE_OPENED(u->source->thread_info.state) ? n_alsa_fds : 0)); */
r = poll(u->pollfd, POLLFD_ALSA_BASE + (PA_SOURCE_OPENED(u->source->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) {
@@ -672,8 +675,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");
@@ -735,7 +738,9 @@ int pa__init(pa_module*m) {
u->module = m;
m->userdata = u;
u->use_mmap = use_mmap;
- pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
+ u->n_alsa_fds = 0;
+ u->pollfd = NULL;
+ 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_CAPTURE, SND_PCM_NONBLOCK)) < 0) {
@@ -807,7 +812,7 @@ int pa__init(pa_module*m) {
u->source->userdata = u;
pa_source_set_module(u->source, m);
- pa_source_set_asyncmsgq(u->source, u->asyncmsgq);
+ pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_description(u->source, t = pa_sprintf_malloc(
"ALSA PCM on %s (%s)",
dev,
@@ -902,12 +907,11 @@ void pa__done(pa_module*m) {
pa_source_disconnect(u->source);
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->source)
pa_source_unref(u->source);
diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c
index 2ede01a4..8b17b59e 100644
--- a/src/modules/module-null-sink.c
+++ b/src/modules/module-null-sink.c
@@ -46,6 +46,7 @@
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/thread.h>
+#include <pulsecore/thread-mq.h>
#include "module-null-sink-symdef.h"
@@ -67,7 +68,7 @@ struct userdata {
pa_module *module;
pa_sink *sink;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
size_t block_size;
struct timeval timestamp;
@@ -118,10 +119,12 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up");
+ pa_thread_mq_install(&u->thread_mq);
+
pa_gettimeofday(&u->timestamp);
memset(&pollfd, 0, sizeof(pollfd));
- pollfd.fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
+ pollfd.fd = pa_asyncmsgq_get_fd(u->thread_mq.inq);
pollfd.events = POLLIN;
for (;;) {
@@ -134,16 +137,16 @@ static void thread_func(void *userdata) {
int64_t offset;
/* 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;
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;
}
@@ -169,11 +172,11 @@ 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;
r = poll(&pollfd, 1, timeout);
- pa_asyncmsgq_after_poll(u->asyncmsgq);
+ pa_asyncmsgq_after_poll(u->thread_mq.inq);
if (r < 0) {
if (errno == EINTR) {
@@ -191,8 +194,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");
@@ -222,7 +225,7 @@ int pa__init(pa_module*m) {
u->module = m;
m->userdata = u;
- pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
+ pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
if (!(u->sink = pa_sink_new(m->core, __FILE__, pa_modargs_get_value(ma, "sink_name", DEFAULT_SINK_NAME), 0, &ss, &map))) {
pa_log("Failed to create sink.");
@@ -233,7 +236,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, pa_modargs_get_value(ma, "description", "NULL sink"));
u->block_size = pa_bytes_per_second(&ss) / 20; /* 50 ms */
@@ -270,12 +273,11 @@ 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);
diff --git a/src/modules/module-oss.c b/src/modules/module-oss.c
index d93d8c79..d71de99a 100644
--- a/src/modules/module-oss.c
+++ b/src/modules/module-oss.c
@@ -79,6 +79,7 @@
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/macro.h>
+#include <pulsecore/thread-mq.h>
#include "oss-util.h"
#include "module-oss-symdef.h"
@@ -111,7 +112,7 @@ struct userdata {
pa_sink *sink;
pa_source *source;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
char *device_name;
@@ -793,11 +794,13 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up");
+ pa_thread_mq_install(&u->thread_mq);
+
trigger(u, 0);
memset(&pollfd, 0, sizeof(pollfd));
- pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
+ pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->thread_mq.inq);
pollfd[POLLFD_ASYNCQ].events = POLLIN;
pollfd[POLLFD_DSP].fd = u->fd;
@@ -812,18 +815,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;
}
@@ -1016,14 +1019,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 (legend: %i=POLLIN, %i=POLLOUT)", u->fd >= 0 ? pollfd[POLLFD_DSP].events : -1, POLLIN, POLLOUT); */
r = poll(pollfd, u->fd >= 0 ? POLLFD_MAX : POLLFD_DSP, -1);
/* pa_log("polling got dsp=%i amq=%i (%i)", r > 0 ? pollfd[POLLFD_DSP].revents : 0, r > 0 ? pollfd[POLLFD_ASYNCQ].revents : 0, r); */
- pa_asyncmsgq_after_poll(u->asyncmsgq);
+ pa_asyncmsgq_after_poll(u->thread_mq.inq);
if (u->fd < 0)
pollfd[POLLFD_DSP].revents = 0;
@@ -1052,8 +1055,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");
@@ -1161,7 +1164,7 @@ int pa__init(pa_module*m) {
u->in_nfrags = u->out_nfrags = u->nfrags = nfrags;
u->out_fragment_size = u->in_fragment_size = u->frag_size = frag_size;
u->use_mmap = use_mmap;
- pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
+ pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
if (ioctl(fd, SNDCTL_DSP_GETISPACE, &info) >= 0) {
pa_log_info("Input -- %u fragments of size %u.", info.fragstotal, info.fragsize);
@@ -1216,7 +1219,7 @@ int pa__init(pa_module*m) {
u->source->userdata = u;
pa_source_set_module(u->source, m);
- pa_source_set_asyncmsgq(u->source, u->asyncmsgq);
+ pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_description(u->source, t = pa_sprintf_malloc(
"OSS PCM on %s%s%s%s",
dev,
@@ -1270,7 +1273,7 @@ try_write:
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(
"OSS PCM on %s%s%s%s",
dev,
@@ -1300,9 +1303,9 @@ go_on:
/* Read mixer settings */
if (u->source)
- pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->source), PA_SOURCE_MESSAGE_GET_VOLUME, &u->source->volume, 0, NULL, NULL);
+ pa_asyncmsgq_post(u->thread_mq.inq, PA_MSGOBJECT(u->source), PA_SOURCE_MESSAGE_GET_VOLUME, &u->source->volume, 0, NULL, NULL);
if (u->sink)
- pa_asyncmsgq_post(u->asyncmsgq, PA_MSGOBJECT(u->sink), PA_SINK_MESSAGE_GET_VOLUME, &u->sink->volume, 0, NULL, NULL);
+ pa_asyncmsgq_post(u->thread_mq.inq, PA_MSGOBJECT(u->sink), PA_SINK_MESSAGE_GET_VOLUME, &u->sink->volume, 0, NULL, NULL);
return 0;
@@ -1334,12 +1337,11 @@ void pa__done(pa_module*m) {
pa_source_disconnect(u->source);
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);
diff --git a/src/modules/module-pipe-sink.c b/src/modules/module-pipe-sink.c
index 1b6d0813..2f82cae8 100644
--- a/src/modules/module-pipe-sink.c
+++ b/src/modules/module-pipe-sink.c
@@ -45,6 +45,7 @@
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/thread.h>
+#include <pulsecore/thread-mq.h>
#include "module-pipe-sink-symdef.h"
@@ -67,7 +68,7 @@ struct userdata {
pa_module *module;
pa_sink *sink;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
char *filename;
int fd;
@@ -121,9 +122,11 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up");
+ pa_thread_mq_install(&u->thread_mq);
+
memset(&pollfd, 0, sizeof(pollfd));
- pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
+ pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->thread_mq.inq);
pollfd[POLLFD_ASYNCQ].events = POLLIN;
pollfd[POLLFD_FIFO].fd = u->fd;
@@ -136,16 +139,16 @@ static void thread_func(void *userdata) {
int64_t offset;
/* 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;
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;
}
@@ -194,14 +197,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 %u", pollfd[POLLFD_FIFO].events); */
r = poll(pollfd, POLLFD_MAX, -1);
/* pa_log("polling got %u", r > 0 ? pollfd[POLLFD_FIFO].revents : 0); */
- pa_asyncmsgq_after_poll(u->asyncmsgq);
+ pa_asyncmsgq_after_poll(u->thread_mq.inq);
if (r < 0) {
if (errno == EINTR) {
@@ -225,8 +228,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");
@@ -258,8 +261,7 @@ int pa__init(pa_module*m) {
u->module = m;
m->userdata = u;
pa_memchunk_reset(&u->memchunk);
-
- pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
+ pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->filename = pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
@@ -291,7 +293,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("Unix FIFO sink '%s'", u->filename));
pa_xfree(t);
@@ -325,12 +327,11 @@ 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);
diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index a8fbcf3d..2209d1ee 100644
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -44,6 +44,7 @@
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/thread.h>
+#include <pulsecore/thread-mq.h>
#include "module-pipe-source-symdef.h"
@@ -66,7 +67,7 @@ struct userdata {
pa_module *module;
pa_source *source;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
char *filename;
int fd;
@@ -99,9 +100,11 @@ static void thread_func(void *userdata) {
pa_log_debug("Thread starting up");
+ pa_thread_mq_install(&u->thread_mq);
+
memset(&pollfd, 0, sizeof(pollfd));
- pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->asyncmsgq);
+ pollfd[POLLFD_ASYNCQ].fd = pa_asyncmsgq_get_fd(u->thread_mq.inq);
pollfd[POLLFD_ASYNCQ].events = POLLIN;
pollfd[POLLFD_FIFO].fd = u->fd;
@@ -114,16 +117,16 @@ static void thread_func(void *userdata) {
int64_t offset;
/* 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;
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;
}
@@ -175,14 +178,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[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);
+ pa_asyncmsgq_after_poll(u->thread_mq.inq);
if (r < 0) {
if (errno == EINTR)
@@ -203,8 +206,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");
@@ -236,8 +239,7 @@ int pa__init(pa_module*m) {
u->module = m;
m->userdata = u;
pa_memchunk_reset(&u->memchunk);
-
- pa_assert_se(u->asyncmsgq = pa_asyncmsgq_new(0));
+ pa_thread_mq_init(&u->thread_mq, m->core->mainloop);
u->filename = pa_xstrdup(pa_modargs_get_value(ma, "file", DEFAULT_FILE_NAME));
@@ -268,7 +270,7 @@ int pa__init(pa_module*m) {
u->source->userdata = u;
pa_source_set_module(u->source, m);
- pa_source_set_asyncmsgq(u->source, u->asyncmsgq);
+ pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_description(u->source, t = pa_sprintf_malloc("Unix FIFO source '%s'", u->filename));
pa_xfree(t);
@@ -302,12 +304,11 @@ void pa__done(pa_module*m) {
pa_source_disconnect(u->source);
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->source)
pa_source_unref(u->source);
generated by cgit (git 2.34.1) at 2025-10-31 06:01:11 +0000