diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-21 07:02:57 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-21 07:02:57 +0000 |
commit | 32716d474e01418bc79afcaa4853fff1eabc4221 (patch) | |
tree | bc41cc736cbaa3e5d25e1fa9fffea046b01adacc | |
parent | 34b8c43077108cdb423a61bb9ea5b7a9bd97fc03 (diff) |
merge revision(s) 43851,43882,43883,43995:
* ruby_atomic.h: use __atomic builtin functions supported by GCC.
__sync family are legacy functions now and it is recommended
that new code use the __atomic functions.
http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html
* configure.in: check existence of __atomic functions.
* ruby_atomic.h: define ATOMIC_SIZE_CAS() with
__atomic_compare_exchange_n() and refactoring.
* ruby_atomic.h: remove duplicate definisions between ATOMIC_XXX
and ATOMIC_SIZE_XXX.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 19 | ||||
-rw-r--r-- | configure.in | 25 | ||||
-rw-r--r-- | ruby_atomic.h | 29 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 64 insertions, 11 deletions
@@ -1,3 +1,22 @@ +Sat Dec 21 15:50:13 2013 Masaki Matsushita <glass.saga@gmail.com> + + * ruby_atomic.h: remove duplicate definisions between ATOMIC_XXX + and ATOMIC_SIZE_XXX. + +Sat Dec 21 15:50:13 2013 Masaki Matsushita <glass.saga@gmail.com> + + * ruby_atomic.h: define ATOMIC_SIZE_CAS() with + __atomic_compare_exchange_n() and refactoring. + +Sat Dec 21 15:50:13 2013 Masaki Matsushita <glass.saga@gmail.com> + + * ruby_atomic.h: use __atomic builtin functions supported by GCC. + __sync family are legacy functions now and it is recommended + that new code use the __atomic functions. + http://gcc.gnu.org/onlinedocs/gcc/_005f_005fatomic-Builtins.html + + * configure.in: check existence of __atomic functions. + Sat Dec 21 15:37:11 2013 Naohisa Goto <ngotogenome@gmail.com> * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris diff --git a/configure.in b/configure.in index d242e01657..06367547d8 100644 --- a/configure.in +++ b/configure.in @@ -1340,13 +1340,14 @@ if test "$GCC" = yes; then AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)], [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)]) fi - AC_CACHE_CHECK([for atomic builtins], [rb_cv_gcc_atomic_builtins], [ + + AC_CACHE_CHECK([for __atomic builtins], [rb_cv_gcc_atomic_builtins], [ AC_TRY_LINK([unsigned char atomic_var;], [ - __sync_lock_test_and_set(&atomic_var, 0); - __sync_lock_test_and_set(&atomic_var, 1); - __sync_fetch_and_add(&atomic_var, 1); - __sync_fetch_and_sub(&atomic_var, 1); + __atomic_exchange_n(&atomic_var, 0, __ATOMIC_SEQ_CST); + __atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST); + __atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST); + __atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST); ], [rb_cv_gcc_atomic_builtins=yes], [rb_cv_gcc_atomic_builtins=no])]) @@ -1354,6 +1355,20 @@ if test "$GCC" = yes; then AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS) fi + AC_CACHE_CHECK([for __sync builtins], [rb_cv_gcc_sync_builtins], [ + AC_TRY_LINK([unsigned char atomic_var;], + [ + __sync_lock_test_and_set(&atomic_var, 0); + __sync_lock_test_and_set(&atomic_var, 1); + __sync_fetch_and_add(&atomic_var, 1); + __sync_fetch_and_sub(&atomic_var, 1); + ], + [rb_cv_gcc_sync_builtins=yes], + [rb_cv_gcc_sync_builtins=no])]) + if test "$rb_cv_gcc_sync_builtins" = yes; then + AC_DEFINE(HAVE_GCC_SYNC_BUILTINS) + fi + AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable, [RUBY_WERROR_FLAG( [AC_TRY_LINK([@%:@include <stdlib.h>], diff --git a/ruby_atomic.h b/ruby_atomic.h index 7e16d287f8..8e574153af 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -3,6 +3,21 @@ #if 0 #elif defined HAVE_GCC_ATOMIC_BUILTINS +typedef unsigned int rb_atomic_t; +# define ATOMIC_SET(var, val) (void)__atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST) +# define ATOMIC_INC(var) __atomic_fetch_add(&(var), 1, __ATOMIC_SEQ_CST) +# define ATOMIC_DEC(var) __atomic_fetch_sub(&(var), 1, __ATOMIC_SEQ_CST) +# define ATOMIC_OR(var, val) __atomic_or_fetch(&(var), (val), __ATOMIC_SEQ_CST) +# define ATOMIC_EXCHANGE(var, val) __atomic_exchange_n(&(var), (val), __ATOMIC_SEQ_CST) +# define ATOMIC_CAS(var, oldval, newval) \ +({ __typeof__(oldval) oldvaldup = (oldval); /* oldval should not be modified */ \ + __atomic_compare_exchange_n(&(var), &oldvaldup, (newval), 0, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST); \ + oldvaldup; }) + +# 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) + +#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 * http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html */ @@ -17,9 +32,6 @@ 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_SIZE_INC(var) __sync_fetch_and_add(&(var), 1) -# define ATOMIC_SIZE_DEC(var) __sync_fetch_and_sub(&(var), 1) -# define ATOMIC_SIZE_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val)) #elif defined _WIN32 #if defined _MSC_VER && _MSC_VER > 1200 @@ -117,8 +129,6 @@ extern rb_atomic_t ruby_atomic_compare_and_swap(rb_atomic_t *ptr, # define ATOMIC_SIZE_ADD(var, val) (void)((var) += (val)) # define ATOMIC_SIZE_SUB(var, val) (void)((var) -= (val)) -# define ATOMIC_SIZE_INC(var) ((var)++) -# define ATOMIC_SIZE_DEC(var) ((var)--) # define ATOMIC_SIZE_EXCHANGE(var, val) atomic_size_exchange(&(var), (val)) static inline size_t atomic_size_exchange(size_t *ptr, size_t val) @@ -129,6 +139,15 @@ atomic_size_exchange(size_t *ptr, size_t val) } #endif +#ifndef ATOMIC_SIZE_INC +# define ATOMIC_SIZE_INC(var) ATOMIC_INC(var) +#endif +#ifndef ATOMIC_SIZE_DEC +# define ATOMIC_SIZE_DEC(var) ATOMIC_DEC(var) +#endif +#ifndef ATOMIC_SIZE_EXCHANGE +# define ATOMIC_SIZE_EXCHANGE(var, val) ATOMIC_EXCHANGE(var, val) +#endif #ifndef ATOMIC_SIZE_CAS # define ATOMIC_SIZE_CAS(var, oldval, val) ATOMIC_CAS(var, oldval, val) #endif @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-12-21" -#define RUBY_PATCHLEVEL 362 +#define RUBY_PATCHLEVEL 363 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 12 |