fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 11:08:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[atomic] Use an integer __sync_val_compare_and_swap() for pointer CAS.

Browse source 
Fix an implicit pointer/integer cast in _cairo_atomic_ptr_cmpxchg()
when building with LLVM/clang.

The Intel synchronization primitives __sync_val_compare_and_swap()
are only defined by Intel for types int, long, long long and their
unsigned variants.  This patch uses one of those for
_cairo_atomic_ptr_cmpxchg() instead of relying on a gcc extension of
__sync_val_compare_and_swap() to pointer types.
This commit is contained in:
M Joonas Pihlaja 2009-06-21 14:02:46 +01:00
parent d0c1c92821
commit 80990c7f72
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/cairo-atomic-private.h
View file

@ -54,8 +54,15 @@ typedef int cairo_atomic_int_t;
# define _cairo_atomic_int_inc(x) ((void) __sync_fetch_and_add(x, 1))
# define _cairo_atomic_int_dec_and_test(x) (__sync_fetch_and_add(x, -1) == 1)
# define _cairo_atomic_int_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap (x, oldv, newv)
# define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) __sync_val_compare_and_swap (x, oldv, newv)
# define _cairo_atomic_ptr_cmpxchg(x, oldv, newv) \
(sizeof(void*) == sizeof(int) ?\
(void*)__sync_val_compare_and_swap ((int*)x, (int)oldv, (int)newv) :\
sizeof(void*) == sizeof(long) ?\
(void*)__sync_val_compare_and_swap ((long*)x, (long)oldv, (long)newv) :\
sizeof(void*) == sizeof(long long) ?\
(void*)__sync_val_compare_and_swap ((long long*)x, (long long)oldv, (long long)newv) :\
(void*)(oldv)/*impossible*/)
#endif

6
src/cairo-atomic.c
View file

@ -36,7 +36,11 @@
#include "cairo-atomic-private.h"
#include "cairo-mutex-private.h"
#ifndef HAS_ATOMIC_OPS
#ifdef HAS_ATOMIC_OPS
COMPILE_TIME_ASSERT(sizeof(void*) == sizeof(int) ||
sizeof(void*) == sizeof(long) ||
sizeof(void*) == sizeof(long long));
#else
void
_cairo_atomic_int_inc (int *x)
{