[pulseaudio-discuss] [PATCH 1/5] mainloop: Change wakeup_requested type from pa_bool_t to pa_atomic_t.
Tanu Kaskinen
tanu.kaskinen at digia.com
Mon Apr 2 05:01:02 PDT 2012
The variable is accessed from multiple threads, so it should
be atomic.
---
src/pulse/mainloop.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 5c0345e..262e4b3 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -114,7 +114,7 @@ struct pa_mainloop {
int retval;
pa_bool_t quit:1;
- pa_bool_t wakeup_requested:1;
+ pa_atomic_t wakeup_requested;
int wakeup_pipe[2];
int wakeup_pipe_type;
@@ -792,7 +792,7 @@ void pa_mainloop_wakeup(pa_mainloop *m) {
if (m->wakeup_pipe[1] >= 0 && m->state == STATE_POLLING) {
pa_write(m->wakeup_pipe[1], &c, sizeof(c), &m->wakeup_pipe_type);
- m->wakeup_requested++;
+ pa_atomic_store(&m->wakeup_requested, TRUE);
}
}
@@ -804,10 +804,9 @@ static void clear_wakeup(pa_mainloop *m) {
if (m->wakeup_pipe[0] < 0)
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))
;
- m->wakeup_requested = 0;
}
}
--
1.7.8
More information about the pulseaudio-discuss
mailing list