From 34b8c43077108cdb423a61bb9ea5b7a9bd97fc03 Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 21 Dec 2013 06:47:16 +0000 Subject: [PATCH] merge revision(s) 41759,41760,43356,43460,43677: * ruby_atomic.h (ATOMIC_CAS): suppress C4022 and C4047 warnings in VC6. only InterlockedCompareExchange is declared using PVOID. * ruby_atomic.h (rb_w32_atomic_cas): call InterlockedCompareExchange directly. * ruby_atomic.h (ATOMIC_CAS): fix missing function call. * ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t. * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris since r43460. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 21 +++++++++++++++++++++ ruby_atomic.h | 21 ++++++++++++++++++--- version.h | 2 +- 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c5f96c65ce..1f00581f34 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +Sat Dec 21 15:37:11 2013 Naohisa Goto + + * ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris + since r43460. + +Sat Dec 21 15:37:11 2013 Nobuyoshi Nakada + + * ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t. + +Sat Dec 21 15:37:11 2013 Nobuyoshi Nakada + + * ruby_atomic.h (rb_w32_atomic_cas): call InterlockedCompareExchange + directly. + + * ruby_atomic.h (ATOMIC_CAS): fix missing function call. + +Sat Dec 21 15:37:11 2013 Nobuyoshi Nakada + + * ruby_atomic.h (ATOMIC_CAS): suppress C4022 and C4047 warnings in + VC6. only InterlockedCompareExchange is declared using PVOID. + Sat Dec 21 14:54:37 2013 CHIKANAGA Tomoyuki * ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] remove example of diff --git a/ruby_atomic.h b/ruby_atomic.h index 4a53e60824..7e16d287f8 100644 --- a/ruby_atomic.h +++ b/ruby_atomic.h @@ -50,15 +50,25 @@ rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val) #endif # define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val)) # define ATOMIC_CAS(var, oldval, newval) InterlockedCompareExchange(&(var), (newval), (oldval)) +# if defined _MSC_VER && _MSC_VER <= 1200 +static inline rb_atomic_t +rb_w32_atomic_cas(volatile rb_atomic_t *var, rb_atomic_t oldval, rb_atomic_t newval) +{ + return (rb_atomic_t)InterlockedCompareExchange((PVOID *)var, (PVOID)newval, (PVOID)oldval); +} +# undef ATOMIC_CAS +# define ATOMIC_CAS(var, oldval, newval) rb_w32_atomic_cas(&(var), (oldval), (newval)) +# endif # ifdef _M_AMD64 -# define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd64(&(var), (val)) -# define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd64(&(var), -(val)) +# define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd64((LONG_LONG *)&(var), (val)) +# define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd64((LONG_LONG *)&(var), -(LONG)(val)) # define ATOMIC_SIZE_INC(var) InterlockedIncrement64(&(var)) # define ATOMIC_SIZE_DEC(var) InterlockedDecrement64(&(var)) # define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange64(&(var), (val)) +# define ATOMIC_SIZE_CAS(var, oldval, val) InterlockedCompareExchange64(&(var), (oldval), (val)) # else # define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd((LONG *)&(var), (val)) -# define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd((LONG *)&(var), -(val)) +# define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd((LONG *)&(var), -(LONG)(val)) # define ATOMIC_SIZE_INC(var) InterlockedIncrement((LONG *)&(var)) # define ATOMIC_SIZE_DEC(var) InterlockedDecrement((LONG *)&(var)) # define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val)) @@ -81,6 +91,7 @@ typedef unsigned int rb_atomic_t; # define ATOMIC_SIZE_INC(var) atomic_inc_ulong(&(var)) # define ATOMIC_SIZE_DEC(var) atomic_dec_ulong(&(var)) # define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_ulong(&(var), (val)) +# define ATOMIC_SIZE_CAS(var, oldval, val) atomic_cas_ulong(&(var), (oldval), (val)) # else # define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val)) # define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val)) @@ -118,4 +129,8 @@ atomic_size_exchange(size_t *ptr, size_t val) } #endif +#ifndef ATOMIC_SIZE_CAS +# define ATOMIC_SIZE_CAS(var, oldval, val) ATOMIC_CAS(var, oldval, val) +#endif + #endif /* RUBY_ATOMIC_H */ diff --git a/version.h b/version.h index d6c6073633..1bdd88a7b4 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-12-21" -#define RUBY_PATCHLEVEL 361 +#define RUBY_PATCHLEVEL 362 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 12