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

add proper refcounting to pa_asyncmsgq objects, to allow destruction from the dispatched callbacks

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1635 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-11 16:01:25 +00:00
parent f7b707b954
commit c1c59b4675
4 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/pulsecore/thread-mq.c
View file

@ -46,11 +46,13 @@ static pa_tls *tls;
static void asyncmsgq_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);
pa_asyncmsgq_ref(aq = q->outq);
pa_asyncmsgq_after_poll(aq);
for (;;) {
pa_msgobject *object;
@ -60,16 +62,18 @@ static void asyncmsgq_cb(pa_mainloop_api*api, pa_io_event* e, int fd, pa_io_even
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;
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_before_poll(aq) == 0)
break;
}
pa_asyncmsgq_unref(aq);
}
void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop) {
@ -90,9 +94,8 @@ void pa_thread_mq_done(pa_thread_mq *q) {
q->mainloop->io_free(q->io_event);
q->io_event = NULL;
pa_asyncmsgq_after_poll(q->outq);
pa_asyncmsgq_free(q->inq);
pa_asyncmsgq_free(q->outq);
pa_asyncmsgq_unref(q->inq);
pa_asyncmsgq_unref(q->outq);
q->inq = q->outq = NULL;
q->mainloop = NULL;