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

don't assume that pa_asyncq_new() always succeeds

Browse source 
Bug 96741 shows a case where an assertion is hit, because
pa_asyncq_new() failed due to running out of file descriptors.
pa_asyncq_new() is used in only one place (not counting the call in
asyncq-test): pa_asyncmsgq_new(). Now pa_asyncmsgq_new() can fail too,
which requires error handling in many places. One of those places is
pa_thread_mq_init(), which can now fail too, and that needs additional
error handling in many more places. Luckily there weren't any places
where adding better error handling wouldn't have been easy, so there are
many changes in this patch, but they are not complicated.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=96741
This commit is contained in:
Tanu Kaskinen 2016-09-13 18:43:38 +03:00
parent 3e52972c61
commit 60695e3d84
27 changed files with 205 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,13 +97,20 @@ static void asyncmsgq_write_outq_cb(pa_mainloop_api *api, pa_io_event *e, int fd
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) {
int 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));
pa_zero(*q);
q->inq = pa_asyncmsgq_new(0);
if (!q->inq)
goto fail;
q->outq = pa_asyncmsgq_new(0);
if (!q->outq)
goto fail;
q->main_mainloop = main_mainloop;
q->thread_mainloop = thread_mainloop;
@ -117,17 +124,31 @@ void pa_thread_mq_init_thread_mainloop(pa_thread_mq *q, pa_mainloop_api *main_ma
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));
return 0;
fail:
pa_thread_mq_done(q);
return -1;
}
void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll) {
int pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rtpoll) {
pa_assert(q);
pa_assert(mainloop);
pa_zero(*q);
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));
q->inq = pa_asyncmsgq_new(0);
if (!q->inq)
goto fail;
q->outq = pa_asyncmsgq_new(0);
if (!q->outq)
goto fail;
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));
@ -137,6 +158,13 @@ void pa_thread_mq_init(pa_thread_mq *q, pa_mainloop_api *mainloop, pa_rtpoll *rt
pa_rtpoll_item_new_asyncmsgq_read(rtpoll, PA_RTPOLL_EARLY, q->inq);
pa_rtpoll_item_new_asyncmsgq_write(rtpoll, PA_RTPOLL_LATE, q->outq);
return 0;
fail:
pa_thread_mq_done(q);
return -1;
}
void pa_thread_mq_done(pa_thread_mq *q) {