-/* $Id$ */
-
/***
This file is part of PulseAudio.
#include <unistd.h>
#include <errno.h>
-#include <pulse/xmalloc.h>
-
-#include <pulsecore/atomic.h>
-#include <pulsecore/once.h>
-#include <pulsecore/log.h>
#include <pulsecore/thread.h>
#include <pulsecore/semaphore.h>
#include <pulsecore/macro.h>
-#include <pulsecore/core-util.h>
-#include <pulsecore/flist.h>
+
+#include <pulse/mainloop-api.h>
#include "thread-mq.h"
-static pa_once once = PA_ONCE_INIT;
-static pa_tls *tls;
+PA_STATIC_TLS_DECLARE_NO_FREE(thread_mq);
-static void asyncmsgq_cb(pa_mainloop_api*api, pa_io_event* e, int fd, pa_io_event_flags_t events, void *userdata) {
+static void asyncmsgq_read_cb(pa_mainloop_api *api, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
pa_thread_mq *q = userdata;
+ pa_asyncmsgq *aq;
- pa_assert(pa_asyncmsgq_get_fd(q->outq) == fd);
pa_assert(events == PA_IO_EVENT_INPUT);
- pa_asyncmsgq_after_poll(q->outq);
+ if (pa_asyncmsgq_read_fd(q->outq) == fd)
+ pa_asyncmsgq_ref(aq = q->outq);
+ else if (pa_asyncmsgq_read_fd(q->inq) == fd)
+ pa_asyncmsgq_ref(aq = q->inq);
+ else
+ pa_assert_not_reached();
+
+ pa_asyncmsgq_read_after_poll(aq);
for (;;) {
pa_msgobject *object;
pa_memchunk chunk;
/* Check whether there is a message for us to process */
- while (pa_asyncmsgq_get(q->outq, &object, &code, &data, &offset, &chunk, 0) == 0) {
+ while (pa_asyncmsgq_get(aq, &object, &code, &data, &offset, &chunk, 0) >= 0) {
int ret;
+ if (!object && code == PA_MESSAGE_SHUTDOWN) {
+ pa_asyncmsgq_done(aq, 0);
+ api->quit(api, 0);
+ break;
+ }
+
ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk);
- pa_asyncmsgq_done(q->outq, ret);
+ pa_asyncmsgq_done(aq, ret);
}
- if (pa_asyncmsgq_before_poll(q->outq) == 0)
+ if (pa_asyncmsgq_read_before_poll(aq) == 0)
break;
}
+
+ pa_asyncmsgq_unref(aq);
+}
+
+static void asyncmsgq_write_inq_cb(pa_mainloop_api *api, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
+ pa_thread_mq *q = userdata;
+
+ pa_assert(pa_asyncmsgq_write_fd(q->inq) == fd);
+ pa_assert(events == PA_IO_EVENT_INPUT);
+
+ pa_asyncmsgq_write_after_poll(q->inq);
+ pa_asyncmsgq_write_before_poll(q->inq);
+}
+
+static void asyncmsgq_write_outq_cb(pa_mainloop_api *api, pa_io_event *e, int fd, pa_io_event_flags_t events, void *userdata) {
+ pa_thread_mq *q = userdata;
+
+ pa_assert(pa_asyncmsgq_write_fd(q->outq) == fd);
+ pa_assert(events == PA_IO_EVENT_INPUT);
+
+ pa_asyncmsgq_write_after_poll(q->outq);
+ pa_asyncmsgq_write_before_poll(q->outq);
+}
+
+void pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_mainloop, pa_mainloop_api *thread_mainloop) {
+ pa_assert(q);
+ pa_assert(main_mainloop);
+ pa_assert(thread_mainloop);
+
+ pa_assert_se(q->inq = pa_asyncmsgq_new(0));
+ pa_assert_se(q->outq = pa_asyncmsgq_new(0));
+
+ q->main_mainloop = main_mainloop;
+ q->thread_mainloop = thread_mainloop;
+
+ pa_assert_se(pa_asyncmsgq_read_before_poll(q->outq) == 0);
+ pa_asyncmsgq_write_before_poll(q->outq);
+ pa_assert_se(q->read_main_event = main_mainloop->io_new(main_mainloop, pa_asyncmsgq_read_fd(q->outq), PA_IO_EVENT_INPUT, asyncmsgq_read_cb, q));
+ pa_assert_se(q->write_thread_event = main_mainloop->io_new(thread_mainloop, pa_asyncmsgq_write_fd(q->outq), PA_IO_EVENT_INPUT, asyncmsgq_write_outq_cb, q));
+
+ pa_asyncmsgq_read_before_poll(q->inq);
+ pa_asyncmsgq_write_before_poll(q->inq);
+ pa_assert_se(q->read_thread_event = thread_mainloop->io_new(thread_mainloop, pa_asyncmsgq_read_fd(q->inq), PA_IO_EVENT_INPUT, asyncmsgq_read_cb, q));
+ pa_assert_se(q->write_main_event = main_mainloop->io_new(main_mainloop, pa_asyncmsgq_write_fd(q->inq), PA_IO_EVENT_INPUT, asyncmsgq_write_inq_cb, q));
}
-void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop) {
+void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll) {
pa_assert(q);
pa_assert(mainloop);
- q->mainloop = mainloop;
+ q->main_mainloop = mainloop;
+ q->thread_mainloop = NULL;
+
pa_assert_se(q->inq = pa_asyncmsgq_new(0));
pa_assert_se(q->outq = pa_asyncmsgq_new(0));
-
- pa_assert_se(pa_asyncmsgq_before_poll(q->outq) == 0);
- pa_assert_se(q->io_event = mainloop->io_new(mainloop, pa_asyncmsgq_get_fd(q->outq), PA_IO_EVENT_INPUT, asyncmsgq_cb, q));
+
+ pa_assert_se(pa_asyncmsgq_read_before_poll(q->outq) == 0);
+ pa_assert_se(q->read_main_event = mainloop->io_new(mainloop, pa_asyncmsgq_read_fd(q->outq), PA_IO_EVENT_INPUT, asyncmsgq_read_cb, q));
+
+ pa_asyncmsgq_write_before_poll(q->inq);
+ pa_assert_se(q->write_main_event = mainloop->io_new(mainloop, pa_asyncmsgq_write_fd(q->inq), PA_IO_EVENT_INPUT, asyncmsgq_write_inq_cb, q));
+
+ pa_rtpoll_item_new_asyncmsgq_read(rtpoll, PA_RTPOLL_EARLY, q->inq);
+ pa_rtpoll_item_new_asyncmsgq_write(rtpoll, PA_RTPOLL_LATE, q->outq);
}
void pa_thread_mq_done(pa_thread_mq *q) {
pa_assert(q);
- q->mainloop->io_free(q->io_event);
- q->io_event = NULL;
+ /* Since we are called from main context we can be sure that the
+ * inq is empty. However, the outq might still contain messages
+ * for the main loop, which we need to dispatch (e.g. release
+ * msgs, other stuff). Hence do so if we aren't currently
+ * dispatching anyway. */
+
+ if (!pa_asyncmsgq_dispatching(q->outq))
+ pa_asyncmsgq_flush(q->outq, true);
- pa_asyncmsgq_after_poll(q->outq);
- pa_asyncmsgq_free(q->inq);
- pa_asyncmsgq_free(q->outq);
+ q->main_mainloop->io_free(q->read_main_event);
+ q->main_mainloop->io_free(q->write_main_event);
+ q->read_main_event = q->write_main_event = NULL;
+
+ if (q->thread_mainloop) {
+ q->thread_mainloop->io_free(q->read_thread_event);
+ q->thread_mainloop->io_free(q->write_thread_event);
+ q->read_thread_event = q->write_thread_event = NULL;
+ }
+
+ pa_asyncmsgq_unref(q->inq);
+ pa_asyncmsgq_unref(q->outq);
q->inq = q->outq = NULL;
-
- q->mainloop = NULL;
-}
-static void init_tls(void) {
- tls = pa_tls_new(NULL);
+ q->main_mainloop = NULL;
+ q->thread_mainloop = NULL;
}
void pa_thread_mq_install(pa_thread_mq *q) {
pa_assert(q);
- pa_run_once(&once, init_tls);
- pa_tls_set(tls, q);
+ pa_assert(!(PA_STATIC_TLS_GET(thread_mq)));
+ PA_STATIC_TLS_SET(thread_mq, q);
}
pa_thread_mq *pa_thread_mq_get(void) {
- pa_thread_mq *q;
-
- pa_run_once(&once, init_tls);
- pa_assert_se(q = pa_tls_get(tls));
- return q;
+ return PA_STATIC_TLS_GET(thread_mq);
}
-