[前][次][番号順一覧][スレッド一覧]

ruby-changes:25547

From: ngoto <ko1@a...>
Date: Sat, 10 Nov 2012 01:05:18 +0900 (JST)
Subject: [ruby-changes:25547] ngoto:r37604 (trunk): * ruby_atomic.h: renamed from atomic.h to avoid header file name conflict

ngoto	2012-11-10 01:05:07 +0900 (Sat, 10 Nov 2012)

  New Revision: 37604

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37604

  Log:
    * ruby_atomic.h: renamed from atomic.h to avoid header file name conflict
      on Solaris 10. [ruby-dev:46414] [Bug #7287]
    * gc.c, signal.c, vm_core.h, common.mk: reflect the rename from atomic.h
      to ruby_atomic.h.

  Added files:
    trunk/ruby_atomic.h
  Removed files:
    trunk/atomic.h
  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/gc.c
    trunk/signal.c
    trunk/vm_core.h

Index: atomic.h
===================================================================
--- atomic.h	(revision 37603)
+++ atomic.h	(revision 37604)
@@ -1,115 +0,0 @@
-#ifndef RUBY_ATOMIC_H
-#define RUBY_ATOMIC_H
-
-#if 0
-#elif defined HAVE_GCC_ATOMIC_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 */
-
-typedef unsigned int rb_atomic_t; /* Anything OK */
-# define ATOMIC_SET(var, val)  (void)__sync_lock_test_and_set(&(var), (val))
-# define ATOMIC_INC(var) __sync_fetch_and_add(&(var), 1)
-# define ATOMIC_DEC(var) __sync_fetch_and_sub(&(var), 1)
-# define ATOMIC_OR(var, val) __sync_or_and_fetch(&(var), (val))
-# define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
-
-# 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
-#pragma intrinsic(_InterlockedOr)
-#endif
-typedef LONG rb_atomic_t;
-
-# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
-# define ATOMIC_INC(var) InterlockedIncrement(&(var))
-# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
-#if defined __GNUC__
-# define ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val))
-#elif defined _MSC_VER && _MSC_VER <= 1200
-# define ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val))
-static inline void
-rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
-{
-#ifdef _M_IX86
-    __asm mov eax, var;
-    __asm mov ecx, val;
-    __asm lock or [eax], ecx;
-#else
-#error unsupported architecture
-#endif
-}
-#else
-# define ATOMIC_OR(var, val) _InterlockedOr(&(var), (val))
-#endif
-# define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val))
-
-# ifdef _M_AMD64
-#  define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd64(&(var), (val))
-#  define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd64(&(var), -(val))
-#  define ATOMIC_SIZE_INC(var) InterlockedIncrement64(&(var))
-#  define ATOMIC_SIZE_DEC(var) InterlockedDecrement64(&(var))
-#  define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange64(&(var), (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_INC(var) InterlockedIncrement((LONG *)&(var))
-#  define ATOMIC_SIZE_DEC(var) InterlockedDecrement((LONG *)&(var))
-#  define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val))
-# endif
-
-#elif defined(__sun)
-#include <atomic.h>
-typedef unsigned int rb_atomic_t;
-
-# define ATOMIC_SET(var, val) (void)atomic_swap_uint(&(var), (val))
-# define ATOMIC_INC(var) atomic_inc_uint(&(var))
-# 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))
-
-# if SIZEOF_SIZE_T == SIZEOF_LONG
-#  define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val))
-#  define ATOMIC_SIZE_SUB(var, val) atomic_add_long(&(var), -(val))
-#  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))
-# else
-#  define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val))
-#  define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val))
-#  define ATOMIC_SIZE_INC(var) atomic_inc_uint(&(var))
-#  define ATOMIC_SIZE_DEC(var) atomic_dec_uint(&(var))
-#  define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_uint(&(var), (val))
-# endif
-
-#else
-typedef int rb_atomic_t;
-#define NEED_RUBY_ATOMIC_EXCHANGE
-extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
-
-# 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_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)
-{
-    size_t old = *ptr;
-    *ptr = val;
-    return old;
-}
-#endif
-
-#endif /* RUBY_ATOMIC_H */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37603)
+++ ChangeLog	(revision 37604)
@@ -1,3 +1,11 @@
+Sat Nov 10 00:49:26 2012  Naohisa Goto  <ngotogenome@g...>
+
+	* ruby_atomic.h: renamed from atomic.h to avoid header file name
+	  conflict on Solaris 10. [ruby-dev:46414] [Bug #7287]
+
+	* gc.c, signal.c, vm_core.h, common.mk: reflect the rename from
+	  atomic.h to ruby_atomic.h.
+
 Sat Nov 10 00:46:57 2012  Naohisa Goto  <ngotogenome@g...>
 
 	* atomic.h: Revert r37491 which is a temporary workaroud.
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 37603)
+++ vm_core.h	(revision 37604)
@@ -22,7 +22,7 @@
 #include "vm_opts.h"
 #include "id.h"
 #include "method.h"
-#include "atomic.h"
+#include "ruby_atomic.h"
 
 #if   defined(_WIN32)
 #include "thread_win32.h"
Index: ruby_atomic.h
===================================================================
--- ruby_atomic.h	(revision 0)
+++ ruby_atomic.h	(revision 37604)
@@ -0,0 +1,115 @@
+#ifndef RUBY_ATOMIC_H
+#define RUBY_ATOMIC_H
+
+#if 0
+#elif defined HAVE_GCC_ATOMIC_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 */
+
+typedef unsigned int rb_atomic_t; /* Anything OK */
+# define ATOMIC_SET(var, val)  (void)__sync_lock_test_and_set(&(var), (val))
+# define ATOMIC_INC(var) __sync_fetch_and_add(&(var), 1)
+# define ATOMIC_DEC(var) __sync_fetch_and_sub(&(var), 1)
+# define ATOMIC_OR(var, val) __sync_or_and_fetch(&(var), (val))
+# define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
+
+# 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
+#pragma intrinsic(_InterlockedOr)
+#endif
+typedef LONG rb_atomic_t;
+
+# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
+# define ATOMIC_INC(var) InterlockedIncrement(&(var))
+# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
+#if defined __GNUC__
+# define ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val))
+#elif defined _MSC_VER && _MSC_VER <= 1200
+# define ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val))
+static inline void
+rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
+{
+#ifdef _M_IX86
+    __asm mov eax, var;
+    __asm mov ecx, val;
+    __asm lock or [eax], ecx;
+#else
+#error unsupported architecture
+#endif
+}
+#else
+# define ATOMIC_OR(var, val) _InterlockedOr(&(var), (val))
+#endif
+# define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val))
+
+# ifdef _M_AMD64
+#  define ATOMIC_SIZE_ADD(var, val) InterlockedExchangeAdd64(&(var), (val))
+#  define ATOMIC_SIZE_SUB(var, val) InterlockedExchangeAdd64(&(var), -(val))
+#  define ATOMIC_SIZE_INC(var) InterlockedIncrement64(&(var))
+#  define ATOMIC_SIZE_DEC(var) InterlockedDecrement64(&(var))
+#  define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange64(&(var), (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_INC(var) InterlockedIncrement((LONG *)&(var))
+#  define ATOMIC_SIZE_DEC(var) InterlockedDecrement((LONG *)&(var))
+#  define ATOMIC_SIZE_EXCHANGE(var, val) InterlockedExchange((LONG *)&(var), (val))
+# endif
+
+#elif defined(__sun)
+#include <atomic.h>
+typedef unsigned int rb_atomic_t;
+
+# define ATOMIC_SET(var, val) (void)atomic_swap_uint(&(var), (val))
+# define ATOMIC_INC(var) atomic_inc_uint(&(var))
+# 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))
+
+# if SIZEOF_SIZE_T == SIZEOF_LONG
+#  define ATOMIC_SIZE_ADD(var, val) atomic_add_long(&(var), (val))
+#  define ATOMIC_SIZE_SUB(var, val) atomic_add_long(&(var), -(val))
+#  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))
+# else
+#  define ATOMIC_SIZE_ADD(var, val) atomic_add_int(&(var), (val))
+#  define ATOMIC_SIZE_SUB(var, val) atomic_add_int(&(var), -(val))
+#  define ATOMIC_SIZE_INC(var) atomic_inc_uint(&(var))
+#  define ATOMIC_SIZE_DEC(var) atomic_dec_uint(&(var))
+#  define ATOMIC_SIZE_EXCHANGE(var, val) atomic_swap_uint(&(var), (val))
+# endif
+
+#else
+typedef int rb_atomic_t;
+#define NEED_RUBY_ATOMIC_EXCHANGE
+extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
+
+# 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_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)
+{
+    size_t old = *ptr;
+    *ptr = val;
+    return old;
+}
+#endif
+
+#endif /* RUBY_ATOMIC_H */

Property changes on: ruby_atomic.h
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: common.mk
===================================================================
--- common.mk	(revision 37603)
+++ common.mk	(revision 37604)
@@ -610,7 +610,7 @@
 ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
 ID_H_INCLUDES      = {$(VPATH)}id.h
 VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
-		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}atomic.h \
+		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
 		     $(ID_H_INCLUDES)
 
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
Index: gc.c
===================================================================
--- gc.c	(revision 37603)
+++ gc.c	(revision 37604)
@@ -22,7 +22,7 @@
 #include "internal.h"
 #include "gc.h"
 #include "constant.h"
-#include "atomic.h"
+#include "ruby_atomic.h"
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/types.h>
Index: signal.c
===================================================================
--- signal.c	(revision 37603)
+++ signal.c	(revision 37604)
@@ -16,7 +16,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <errno.h>
-#include "atomic.h"
+#include "ruby_atomic.h"
 
 #if defined(__native_client__) && defined(NACL_NEWLIB)
 # include "nacl/signal.h"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]