mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: fix race checking for thread exit request

Browse source
This commit is contained in:
Igor V. Kovalenko 2021-01-16 09:17:25 +03:00
parent 158184ddf5
commit 75d8fd7624
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/pulsecore/log.c
View file

@ -185,9 +185,6 @@ static void log_thread_func(void *userdata) {
for (;;) { for (;;) {
if (log_thread_do_exit)
goto finish;
struct log_item *l; struct log_item *l;
if ((l = pa_asyncq_pop(async_queue, false))) { if ((l = pa_asyncq_pop(async_queue, false))) {
@ -195,12 +192,19 @@ static void log_thread_func(void *userdata) {
if (pa_flist_push(PA_STATIC_FLIST_GET(log_items), l) < 0) { if (pa_flist_push(PA_STATIC_FLIST_GET(log_items), l) < 0) {
pa_xfree(l); pa_xfree(l);
} }
} else { if (!log_thread_do_exit)
/* wait */ continue;
pa_mutex_lock(log_mutex);
pa_cond_wait(log_cond, log_mutex);
pa_mutex_unlock(log_mutex);
} }
/* if thread exit is not requested, wait for more items */
pa_mutex_lock(log_mutex);
if (!log_thread_do_exit)
pa_cond_wait(log_cond, log_mutex);
pa_mutex_unlock(log_mutex);
if (log_thread_do_exit)
break;
} }
finish: finish: