diff options
author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 10:21:59 +0000 |
---|---|---|
committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 10:21:59 +0000 |
commit | 5faf4cc77b6a223dc86fddc69e0f377d27f5585a (patch) | |
tree | 72c3ab3a69bfe7684b05ef9279e30aeeee239697 /ruby_atomic.h | |
parent | 6d1266a879a94a6f76106e1bbdfa3576b6612a69 (diff) |
* ruby_atomic.h (ATOMIC_CAS): added for Solaris and other platforms.
* ruby_atomic.h, signal.c (NEED_RUBY_ATOMIC_OPS): renamed from
NEED_RUBY_ATOMIC_EXCHANGE.
* signal.c (ruby_atomic_compare_and_swap): naive, non-atomic
compare-and-swap implementation only used for platforms without
valid support for atomic operations.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby_atomic.h')
-rw-r--r-- | ruby_atomic.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ruby_atomic.h b/ruby_atomic.h index dd23964f76..135a8c7e79 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -73,6 +73,7 @@ typedef unsigned int rb_atomic_t; # define ATOMIC_DEC(var) atomic_dec_uint(&(var)) # define ATOMIC_OR(var, val) atomic_or_uint(&(var), (val)) # define ATOMIC_EXCHANGE(var, val) atomic_swap_uint(&(var), (val)) +# define ATOMIC_CAS(var, oldval, newval) atomic_cas_uint(&(var), (oldval), (newval)) # if SIZEOF_SIZE_T == SIZEOF_LONG # define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val)) @@ -90,14 +91,18 @@ typedef unsigned int rb_atomic_t; #else typedef int rb_atomic_t; -#define NEED_RUBY_ATOMIC_EXCHANGE +#define NEED_RUBY_ATOMIC_OPS extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val); +extern rb_atomic_t ruby_atomic_compare_and_swap(rb_atomic_t *ptr, + rb_atomic_t cmp, + rb_atomic_t newval); # define ATOMIC_SET(var, val) (void)((var) = (val)) # define ATOMIC_INC(var) ((var)++) # define ATOMIC_DEC(var) ((var)--) # define ATOMIC_OR(var, val) ((var) |= (val)) # define ATOMIC_EXCHANGE(var, val) ruby_atomic_exchange(&(var), (val)) +# define ATOMIC_CAS(var, oldval, newval) ruby_atomic_compare_and_swap(&(var), (oldval), (newval)) # define ATOMIC_SIZE_ADD(var, val) (void)((var) += (val)) # define ATOMIC_SIZE_SUB(var, val) (void)((var) -= (val)) |