diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ruby_atomic.h | 10 |
2 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Dec 5 10:47:56 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby_atomic.h (ATOMIC_PTR_EXCHANGE): atomic exchange function for + a generic pointer. + Thu Dec 5 10:47:09 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * gc.c (finalize_deferred): flush all deferred finalizers while other diff --git a/ruby_atomic.h b/ruby_atomic.h index 8e574153af..69efbdc4c4 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -17,6 +17,8 @@ typedef unsigned int rb_atomic_t; # define ATOMIC_SIZE_ADD(var, val) __atomic_fetch_add(&(var), (val), __ATOMIC_SEQ_CST) # define ATOMIC_SIZE_SUB(var, val) __atomic_fetch_sub(&(var), (val), __ATOMIC_SEQ_CST) +# define ATOMIC_PTR_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST) + #elif defined HAVE_GCC_SYNC_BUILTINS /* @shyouhei hack to support atomic operations in case of gcc. Gcc * has its own pseudo-insns to support them. See info, or @@ -33,6 +35,8 @@ typedef unsigned int rb_atomic_t; /* Anything OK */ # define ATOMIC_SIZE_ADD(var, val) __sync_fetch_and_add(&(var), (val)) # define ATOMIC_SIZE_SUB(var, val) __sync_fetch_and_sub(&(var), (val)) +# define ATOMIC_PTR_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val)) + #elif defined _WIN32 #if defined _MSC_VER && _MSC_VER > 1200 #pragma intrinsic(_InterlockedOr) @@ -152,4 +156,10 @@ atomic_size_exchange(size_t *ptr, size_t val) # define ATOMIC_SIZE_CAS(var, oldval, val) ATOMIC_CAS(var, oldval, val) #endif +#ifndef ATOMIC_PTR_EXCHANGE +# if SIZEOF_VOIDP == SIZEOF_SIZE_T +# define ATOMIC_PTR_EXCHANGE(var, val) (void *)ATOMIC_SIZE_EXCHANGE(*(size_t *)&(var), (size_t)(val)) +# endif +#endif + #endif /* RUBY_ATOMIC_H */ |