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

once: make once related variables volatile

Browse source
This commit is contained in:
Lennart Poettering 2010-01-12 23:03:04 +01:00 • committed by Colin Guthrie
parent 66ddeede9e
commit 7f7455b1be
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/pulsecore/flist.h
View file

@ -45,7 +45,7 @@ void* pa_flist_pop(pa_flist*l);
#define PA_STATIC_FLIST_DECLARE(name, size, free_cb) \ #define PA_STATIC_FLIST_DECLARE(name, size, free_cb) \
static struct { \ static struct { \
pa_flist *flist; \ pa_flist *volatile flist; \
pa_once once; \ pa_once once; \
} name##_flist = { NULL, PA_ONCE_INIT }; \ } name##_flist = { NULL, PA_ONCE_INIT }; \
static void name##_flist_init(void) { \ static void name##_flist_init(void) { \

3
src/pulsecore/once.c
View file

@ -29,8 +29,6 @@
#include "once.h" #include "once.h"
pa_bool_t pa_once_begin(pa_once *control) { pa_bool_t pa_once_begin(pa_once *control) {
pa_mutex *m;
pa_assert(control); pa_assert(control);
if (pa_atomic_load(&control->done)) if (pa_atomic_load(&control->done))
@ -43,6 +41,7 @@ pa_bool_t pa_once_begin(pa_once *control) {
* executed by us. Hence the awkward locking. */ * executed by us. Hence the awkward locking. */
for (;;) { for (;;) {
pa_mutex *m;
if ((m = pa_atomic_ptr_load(&control->mutex))) { if ((m = pa_atomic_ptr_load(&control->mutex))) {

8
src/pulsecore/thread-posix.c
View file

@ -80,11 +80,9 @@ pa_thread* pa_thread_new(pa_thread_func_t thread_func, void *userdata) {
pa_assert(thread_func); pa_assert(thread_func);
t = pa_xnew(pa_thread, 1); t = pa_xnew0(pa_thread, 1);
t->thread_func = thread_func; t->thread_func = thread_func;
t->userdata = userdata; t->userdata = userdata;
t->joined = FALSE;
pa_atomic_store(&t->running, 0);
if (pthread_create(&t->id, NULL, internal_thread_func, t) < 0) { if (pthread_create(&t->id, NULL, internal_thread_func, t) < 0) {
pa_xfree(t); pa_xfree(t);
@ -135,10 +133,8 @@ pa_thread* pa_thread_self(void) {
/* This is a foreign thread, let's create a pthread structure to /* This is a foreign thread, let's create a pthread structure to
* make sure that we can always return a sensible pointer */ * make sure that we can always return a sensible pointer */
t = pa_xnew(pa_thread, 1); t = pa_xnew0(pa_thread, 1);
t->id = pthread_self(); t->id = pthread_self();
t->thread_func = NULL;
t->userdata = NULL;
t->joined = TRUE; t->joined = TRUE;
pa_atomic_store(&t->running, 2); pa_atomic_store(&t->running, 2);

2
src/pulsecore/thread.h
View file

@ -55,7 +55,7 @@ void *pa_tls_set(pa_tls *t, void *userdata);
#define PA_STATIC_TLS_DECLARE(name, free_cb) \ #define PA_STATIC_TLS_DECLARE(name, free_cb) \
static struct { \ static struct { \
pa_once once; \ pa_once once; \
pa_tls *tls; \ pa_tls *volatile tls; \
} name##_tls = { \ } name##_tls = { \
.once = PA_ONCE_INIT, \ .once = PA_ONCE_INIT, \
.tls = NULL \ .tls = NULL \