#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"
pa_module *module;
pa_sink *sink;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
snd_pcm_t *pcm_handle;
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) {
pa_log_debug("Thread starting up");
+ pa_thread_mq_install(&u->thread_mq);
+
if (build_pollfd(u) < 0)
goto fail;
/* 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;
}
}
/* 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) {
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");
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) {
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,
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);
#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"
pa_module *module;
pa_source *source;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
snd_pcm_t *pcm_handle;
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) {
pa_log_debug("Thread starting up");
+ pa_thread_mq_install(&u->thread_mq);
+
if (build_pollfd(u) < 0)
goto fail;
/* 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;
}
}
/* 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) {
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");
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) {
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,
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);
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/thread.h>
+#include <pulsecore/thread-mq.h>
#include "module-null-sink-symdef.h"
pa_module *module;
pa_sink *sink;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
size_t block_size;
struct timeval timestamp;
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 (;;) {
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;
}
/* 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) {
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");
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.");
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 */
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);
#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"
pa_sink *sink;
pa_source *source;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
char *device_name;
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;
/* 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;
}
/* 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;
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");
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);
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,
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,
/* 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;
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);
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/thread.h>
+#include <pulsecore/thread-mq.h>
#include "module-pipe-sink-symdef.h"
pa_module *module;
pa_sink *sink;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
char *filename;
int fd;
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;
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;
}
/* 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) {
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");
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));
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);
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);
#include <pulsecore/modargs.h>
#include <pulsecore/log.h>
#include <pulsecore/thread.h>
+#include <pulsecore/thread-mq.h>
#include "module-pipe-source-symdef.h"
pa_module *module;
pa_source *source;
pa_thread *thread;
- pa_asyncmsgq *asyncmsgq;
+ pa_thread_mq thread_mq;
char *filename;
int fd;
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;
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;
}
/* 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)
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");
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));
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);
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);
}
}
-static void asyncmsgq_cb(pa_mainloop_api*api, pa_io_event* e, int fd, pa_io_event_flags_t events, void *userdata) {
- pa_core *c = userdata;
-
- pa_assert(pa_asyncmsgq_get_fd(c->asyncmsgq) == fd);
- pa_assert(events == PA_IO_EVENT_INPUT);
-
- pa_asyncmsgq_after_poll(c->asyncmsgq);
-
- for (;;) {
- pa_msgobject *object;
- int code;
- void *data;
- int64_t offset;
- pa_memchunk chunk;
-
- /* Check whether there is a message for us to process */
- while (pa_asyncmsgq_get(c->asyncmsgq, &object, &code, &data, &offset, &chunk, 0) == 0) {
- int ret;
-
- ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk);
- pa_asyncmsgq_done(c->asyncmsgq, ret);
- }
-
- if (pa_asyncmsgq_before_poll(c->asyncmsgq) == 0)
- break;
- }
-}
-
static void core_free(pa_object *o);
pa_core* pa_core_new(pa_mainloop_api *m, int shared) {
pa_check_signal_is_blocked(SIGPIPE);
#endif
- pa_assert_se(c->asyncmsgq = pa_asyncmsgq_new(0));
- pa_assert_se(pa_asyncmsgq_before_poll(c->asyncmsgq) == 0);
- pa_assert_se(c->asyncmsgq_event = c->mainloop->io_new(c->mainloop, pa_asyncmsgq_get_fd(c->asyncmsgq), PA_IO_EVENT_INPUT, asyncmsgq_cb, c));
-
return c;
}
pa_xfree(c->default_source_name);
pa_xfree(c->default_sink_name);
- pa_asyncmsgq_after_poll(c->asyncmsgq);
- pa_asyncmsgq_free(c->asyncmsgq);
-
pa_mempool_free(c->mempool);
pa_property_cleanup(c);
- c->mainloop->io_free(c->asyncmsgq_event);
-
pa_hook_free(&c->hook_sink_new);
pa_hook_free(&c->hook_sink_new_post);
pa_hook_free(&c->hook_sink_disconnect);
static void quit_callback(pa_mainloop_api*m, pa_time_event *e, PA_GCC_UNUSED const struct timeval *tv, void *userdata) {
pa_core *c = userdata;
- assert(c->quit_event = e);
+ pa_assert(c->quit_event = e);
m->quit(m, 0);
}
void pa_core_check_quit(pa_core *c) {
- assert(c);
+ pa_assert(c);
if (!c->quit_event && c->exit_idle_time >= 0 && pa_idxset_size(c->clients) == 0) {
struct timeval tv;
hook_source_output_new_post,
hook_source_output_disconnect,
hook_source_output_disconnect_post;
-
- pa_asyncmsgq *asyncmsgq;
- pa_io_event *asyncmsgq_event;
};
PA_DECLARE_CLASS(pa_core);
#include <pulsecore/sink-input.h>
#include <pulsecore/gccmacro.h>
+#include <pulsecore/thread-mq.h>
#include "play-memchunk.h"
if (u->memchunk.length <= 0) {
pa_memblock_unref(u->memchunk.memblock);
u->memchunk.memblock = NULL;
- pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u), MEMCHUNK_STREAM_MESSAGE_UNLINK, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(u), MEMCHUNK_STREAM_MESSAGE_UNLINK, NULL, 0, NULL, NULL);
return -1;
}
#include <pulsecore/core-error.h>
#include <pulsecore/ipacl.h>
#include <pulsecore/macro.h>
+#include <pulsecore/thread-mq.h>
#include "endianmacros.h"
/*** sink_input callbacks ***/
+/* Called from thread context */
static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk) {
pa_sink_input *i = PA_SINK_INPUT(o);
connection*c;
}
}
-
+/* Called from thread context */
static int sink_input_peek_cb(pa_sink_input *i, pa_memchunk *chunk) {
connection*c;
int r;
pa_assert(chunk);
if ((r = pa_memblockq_peek(c->input_memblockq, chunk)) < 0 && c->dead)
- pa_asyncmsgq_post(c->protocol->core->asyncmsgq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_UNLINK_CONNECTION, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_UNLINK_CONNECTION, NULL, 0, NULL, NULL);
return r;
}
+/* Called from thread context */
static void sink_input_drop_cb(pa_sink_input *i, size_t length) {
connection*c;
size_t old, new;
if (new > old) {
if (pa_atomic_add(&c->playback.missing, new - old) <= 0)
- pa_asyncmsgq_post(c->protocol->core->asyncmsgq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
}
}
/*** source_output callbacks ***/
+/* Called from thread context */
static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) {
connection *c;
pa_assert(c);
pa_assert(chunk);
- pa_asyncmsgq_post(c->protocol->core->asyncmsgq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
}
static void source_output_kill_cb(pa_source_output *o) {
#include <pulsecore/creds.h>
#include <pulsecore/core-util.h>
#include <pulsecore/ipacl.h>
+#include <pulsecore/thread-mq.h>
#include "protocol-native.h"
previous_missing = pa_atomic_add(&s->missing, delta);
if (previous_missing < pa_memblockq_get_minreq(s->memblockq) && previous_missing+delta >= pa_memblockq_get_minreq(s->memblockq))
- pa_asyncmsgq_post(s->connection->protocol->core->asyncmsgq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
}
static void send_memblock(connection *c) {
if (pa_memblockq_push_align(s->memblockq, chunk) < 0) {
pa_log_warn("Failed to push data into queue");
- pa_asyncmsgq_post(s->connection->protocol->core->asyncmsgq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_OVERFLOW, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_OVERFLOW, NULL, 0, NULL, NULL);
pa_memblockq_seek(s->memblockq, chunk->length, PA_SEEK_RELATIVE);
}
pa_memblockq_prebuf_disable(s->memblockq);
if (!pa_memblockq_is_readable(s->memblockq))
- pa_asyncmsgq_post(s->connection->protocol->core->asyncmsgq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, userdata, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, userdata, 0, NULL, NULL);
else {
s->drain_tag = PA_PTR_TO_UINT(userdata);
s->drain_request = 1;
pa_assert(chunk);
if (pa_memblockq_get_length(s->memblockq) <= 0 && !s->underrun) {
- pa_asyncmsgq_post(s->connection->protocol->core->asyncmsgq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_UNDERFLOW, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_UNDERFLOW, NULL, 0, NULL, NULL);
s->underrun = 1;
}
if (s->drain_request && !pa_memblockq_is_readable(s->memblockq)) {
s->drain_request = 0;
- pa_asyncmsgq_post(s->connection->protocol->core->asyncmsgq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, PA_UINT_TO_PTR(s->drain_tag), 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_DRAIN_ACK, PA_UINT_TO_PTR(s->drain_tag), 0, NULL, NULL);
}
request_bytes(s);
record_stream_assert_ref(s);
pa_assert(chunk);
- pa_asyncmsgq_post(s->connection->protocol->core->asyncmsgq, PA_MSGOBJECT(s), RECORD_STREAM_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), RECORD_STREAM_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
}
static void source_output_kill_cb(pa_source_output *o) {
#include <pulsecore/log.h>
#include <pulsecore/core-error.h>
#include <pulsecore/atomic.h>
+#include <pulsecore/thread-mq.h>
#include "protocol-simple.h"
/* pa_log("peeked %u %i", r >= 0 ? chunk->length: 0, r); */
if (c->dead && r < 0)
- pa_asyncmsgq_post(c->protocol->core->asyncmsgq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_UNLINK_CONNECTION, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_UNLINK_CONNECTION, NULL, 0, NULL, NULL);
return r;
}
if (new > old) {
if (pa_atomic_add(&c->playback.missing, new - old) <= 0)
- pa_asyncmsgq_post(c->protocol->core->asyncmsgq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
}
}
pa_assert(c);
pa_assert(chunk);
- pa_asyncmsgq_post(c->protocol->core->asyncmsgq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(c), CONNECTION_MESSAGE_POST_DATA, NULL, 0, chunk, NULL);
}
/* Called from main context */
#include <pulsecore/core-error.h>
#include <pulsecore/sink-input.h>
#include <pulsecore/log.h>
+#include <pulsecore/thread-mq.h>
#include "sound-file-stream.h"
pa_memblock_unref(u->memchunk.memblock);
pa_memchunk_reset(&u->memchunk);
- pa_asyncmsgq_post(u->core->asyncmsgq, PA_MSGOBJECT(u), FILE_STREAM_MESSAGE_UNLINK, NULL, 0, NULL, NULL);
+ pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(u), FILE_STREAM_MESSAGE_UNLINK, NULL, 0, NULL, NULL);
sf_close(u->sndfile);
u->sndfile = NULL;