1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
$NetBSD: patch-dbinc_atomic.h,v 1.2 2015/09/08 18:51:27 joerg Exp $
Don't define inline functions in the protected namespace.
This conflicts with Clang builtins.
Avoid overlap with stdatomic.h, the C++ binding uses <atomic>.
--- dbinc/atomic.h.orig 2010-04-12 20:25:22.000000000 +0000
+++ dbinc/atomic.h
@@ -70,7 +70,7 @@ typedef struct {
* These have no memory barriers; the caller must include them when necessary.
*/
#define atomic_read(p) ((p)->value)
-#define atomic_init(p, val) ((p)->value = (val))
+#define db_atomic_init(p, val) ((p)->value = (val))
#ifdef HAVE_ATOMIC_SUPPORT
@@ -141,11 +141,7 @@ typedef LONG volatile *interlocked_val;
#if defined(HAVE_ATOMIC_X86_GCC_ASSEMBLY)
/* x86/x86_64 gcc */
-#define atomic_inc(env, p) __atomic_inc(p)
-#define atomic_dec(env, p) __atomic_dec(p)
-#define atomic_compare_exchange(env, p, o, n) \
- __atomic_compare_exchange((p), (o), (n))
-static inline int __atomic_inc(db_atomic_t *p)
+static inline int atomic_inc(ENV *unused, db_atomic_t *p)
{
int temp;
@@ -156,7 +152,7 @@ static inline int __atomic_inc(db_atomic
return (temp + 1);
}
-static inline int __atomic_dec(db_atomic_t *p)
+static inline int atomic_dec(ENV *unused, db_atomic_t *p)
{
int temp;
@@ -176,7 +172,7 @@ static inline int __atomic_dec(db_atomic
* http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
* which configure could be changed to use.
*/
-static inline int __atomic_compare_exchange(
+static inline int atomic_compare_exchange(ENV *unused,
db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
{
atomic_value_t was;
@@ -206,7 +202,7 @@ static inline int __atomic_compare_excha
#define atomic_dec(env, p) (--(p)->value)
#define atomic_compare_exchange(env, p, oldval, newval) \
(DB_ASSERT(env, atomic_read(p) == (oldval)), \
- atomic_init(p, (newval)), 1)
+ db_atomic_init(p, (newval)), 1)
#else
#define atomic_inc(env, p) __atomic_inc(env, p)
#define atomic_dec(env, p) __atomic_dec(env, p)
|
