diff options
Diffstat (limited to 'gfx/cairo/cairo/src/cairo-mutex.c')
| -rw-r--r-- | gfx/cairo/cairo/src/cairo-mutex.c | 41 |
1 files changed, 34 insertions, 7 deletions
diff --git a/gfx/cairo/cairo/src/cairo-mutex.c b/gfx/cairo/cairo/src/cairo-mutex.c index 0a31dced3e..5b6debeca7 100644 --- a/gfx/cairo/cairo/src/cairo-mutex.c +++ b/gfx/cairo/cairo/src/cairo-mutex.c @@ -41,13 +41,17 @@ #if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER || _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER +#define _CAIRO_MUTEX_UNINITIALIZED 0 +#define _CAIRO_MUTEX_INITIALIZING 1 +#define _CAIRO_MUTEX_INITIALIZED 2 + # if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER -# define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE FALSE +# define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE _CAIRO_MUTEX_UNINITIALIZED # else -# define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE TRUE +# define _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE _CAIRO_MUTEX_INITIALIZED # endif -cairo_bool_t _cairo_mutex_initialized = _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE; +int _cairo_mutex_initialized = _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE; # undef _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VALUE @@ -56,24 +60,47 @@ cairo_bool_t _cairo_mutex_initialized = _CAIRO_MUTEX_IMPL_INITIALIZED_DEFAULT_VA #if _CAIRO_MUTEX_IMPL_USE_STATIC_INITIALIZER void _cairo_mutex_initialize (void) { - if (_cairo_mutex_initialized) +#if HAS_ATOMIC_OPS + int old_value; + do { + old_value = _cairo_atomic_int_cmpxchg_return_old (&_cairo_mutex_initialized, + _CAIRO_MUTEX_UNINITIALIZED, + _CAIRO_MUTEX_INITIALIZING); + if (old_value == _CAIRO_MUTEX_INITIALIZED) + return; + + } while (old_value == _CAIRO_MUTEX_INITIALIZING); +#else + if (_cairo_mutex_initialized == _CAIRO_MUTEX_INITIALIZED) return; - _cairo_mutex_initialized = TRUE; + _cairo_mutex_initialized = _CAIRO_MUTEX_INITIALIZED; +#endif #define CAIRO_MUTEX_DECLARE(mutex) CAIRO_MUTEX_INIT (mutex); #include "cairo-mutex-list-private.h" #undef CAIRO_MUTEX_DECLARE + +#if HAS_ATOMIC_OPS + _cairo_atomic_int_set_relaxed (&_cairo_mutex_initialized, _CAIRO_MUTEX_INITIALIZED); +#endif } #endif #if _CAIRO_MUTEX_IMPL_USE_STATIC_FINALIZER void _cairo_mutex_finalize (void) { - if (!_cairo_mutex_initialized) +#if HAS_ATOMIC_OPS + if (!_cairo_atomic_int_cmpxchg (&_cairo_mutex_initialized, + _CAIRO_MUTEX_INITIALIZED, + _CAIRO_MUTEX_UNINITIALIZED)) + return; +#else + if (_cairo_mutex_initialized != _CAIRO_MUTEX_INITIALIZED) return; - _cairo_mutex_initialized = FALSE; + _cairo_mutex_initialized = _CAIRO_MUTEX_UNINITIALIZED; +#endif #define CAIRO_MUTEX_DECLARE(mutex) CAIRO_MUTEX_FINI (mutex); #include "cairo-mutex-list-private.h" |