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

mainloop: Change wakeup_requested type from pa_bool_t to pa_atomic_t.

Browse source 
The variable is accessed from multiple threads, so it should
be atomic.
This commit is contained in:
Tanu Kaskinen 2012-04-02 15:01:02 +03:00 • committed by Tanu Kaskinen
parent 387681d417
commit 58de999a31
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pulse/mainloop.c
View file

@ -114,7 +114,7 @@ struct pa_mainloop {
int retval; int retval;
pa_bool_t quit:1; pa_bool_t quit:1;
pa_bool_t wakeup_requested:1; pa_atomic_t wakeup_requested;
int wakeup_pipe[2]; int wakeup_pipe[2];
int wakeup_pipe_type; int wakeup_pipe_type;
@ -774,7 +774,7 @@ void pa_mainloop_wakeup(pa_mainloop *m) {
if (m->wakeup_pipe[1] >= 0 && m->state == STATE_POLLING) { if (m->wakeup_pipe[1] >= 0 && m->state == STATE_POLLING) {
pa_write(m->wakeup_pipe[1], &c, sizeof(c), &m->wakeup_pipe_type); pa_write(m->wakeup_pipe[1], &c, sizeof(c), &m->wakeup_pipe_type);
m->wakeup_requested++; pa_atomic_store(&m->wakeup_requested, TRUE);
} }
} }
@ -786,10 +786,9 @@ static void clear_wakeup(pa_mainloop *m) {
if (m->wakeup_pipe[0] < 0) if (m->wakeup_pipe[0] < 0)
return; return;
if (m->wakeup_requested) { if (pa_atomic_cmpxchg(&m->wakeup_requested, TRUE, FALSE)) {
while (pa_read(m->wakeup_pipe[0], &c, sizeof(c), &m->wakeup_pipe_type) == sizeof(c)) while (pa_read(m->wakeup_pipe[0], &c, sizeof(c), &m->wakeup_pipe_type) == sizeof(c))
; ;
m->wakeup_requested = 0;
} }
} }