thread-mq: do final q flush only when we aren't dispatching anyway

This commit is contained in:
Lennart Poettering 2009-08-15 22:23:42 +02:00
parent 0c20e740f6
commit 011add1c83

View file

@ -59,7 +59,7 @@ static void asyncmsgq_read_cb(pa_mainloop_api*api, pa_io_event* e, int fd, pa_io
pa_memchunk chunk; pa_memchunk chunk;
/* Check whether there is a message for us to process */ /* Check whether there is a message for us to process */
while (pa_asyncmsgq_get(aq, &object, &code, &data, &offset, &chunk, 0) == 0) { while (pa_asyncmsgq_get(aq, &object, &code, &data, &offset, &chunk, 0) >= 0) {
int ret; int ret;
ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk); ret = pa_asyncmsgq_dispatch(object, code, data, offset, &chunk);
@ -107,8 +107,10 @@ void pa_thread_mq_done(pa_thread_mq *q) {
/* Since we are called from main context we can be sure that the /* Since we are called from main context we can be sure that the
* inq is empty. However, the outq might still contain messages * inq is empty. However, the outq might still contain messages
* for the main loop, which we need to dispatch (e.g. release * for the main loop, which we need to dispatch (e.g. release
* msgs, other stuff). Hence do so. */ * 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_flush(q->outq, TRUE);
q->mainloop->io_free(q->read_event); q->mainloop->io_free(q->read_event);