kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ruby_atomic.h (ATOMIC_CAS): added for Solaris and other platforms.

Browse source 
* 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
This commit is contained in:
ngoto 2012-11-27 10:21:59 +00:00
parent 6d1266a879
commit 5faf4cc77b
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Tue Nov 27 18:51:06 2012 Naohisa Goto <ngotogenome@gmail.com>
* 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.
Tue Nov 27 17:43:46 2012 Eric Hodel <drbrain@segment7.net> Tue Nov 27 17:43:46 2012 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/*: Added --root option for building documentation outside * lib/rdoc/*: Added --root option for building documentation outside

7
ruby_atomic.h
View file

@ -73,6 +73,7 @@ typedef unsigned int rb_atomic_t;
# define ATOMIC_DEC(var) atomic_dec_uint(&(var)) # define ATOMIC_DEC(var) atomic_dec_uint(&(var))
# define ATOMIC_OR(var, val) atomic_or_uint(&(var), (val)) # define ATOMIC_OR(var, val) atomic_or_uint(&(var), (val))
# define ATOMIC_EXCHANGE(var, val) atomic_swap_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 # if SIZEOF_SIZE_T == SIZEOF_LONG
# define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val)) # define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val))
@ -90,14 +91,18 @@ typedef unsigned int rb_atomic_t;
#else #else
typedef int rb_atomic_t; 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_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_SET(var, val) (void)((var) = (val))
# define ATOMIC_INC(var) ((var)++) # define ATOMIC_INC(var) ((var)++)
# define ATOMIC_DEC(var) ((var)--) # define ATOMIC_DEC(var) ((var)--)
# define ATOMIC_OR(var, val) ((var) |= (val)) # define ATOMIC_OR(var, val) ((var) |= (val))
# define ATOMIC_EXCHANGE(var, val) ruby_atomic_exchange(&(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_ADD(var, val) (void)((var) += (val))
# define ATOMIC_SIZE_SUB(var, val) (void)((var) -= (val)) # define ATOMIC_SIZE_SUB(var, val) (void)((var) -= (val))

13
signal.c
View file

@ -23,7 +23,7 @@
# include "nacl/signal.h" # include "nacl/signal.h"
#endif #endif
#ifdef NEED_RUBY_ATOMIC_EXCHANGE #ifdef NEED_RUBY_ATOMIC_OPS
rb_atomic_t rb_atomic_t
ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val) ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val)
{ {
@ -31,6 +31,17 @@ ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val)
*ptr = val; *ptr = val;
return old; return old;
} }
rb_atomic_t
ruby_atomic_compare_and_swap(rb_atomic_t *ptr, rb_atomic_t cmp,
rb_atomic_t newval)
{
rb_atomic_t old = *ptr;
if (old == cmp) {
*ptr = newval;
}
return old;
}
#endif #endif
#if defined(__BEOS__) || defined(__HAIKU__) #if defined(__BEOS__) || defined(__HAIKU__)