Avoid overlap between db's atomic.h and stdatomic.h.

6 files changed, 108 insertions, 4 deletions

diff --git a/databases/db4/distinfo b/databases/db4/distinfo
index cd145631c39..b41e4937db5 100644
--- a/databases/db4/distinfo
+++ b/databases/db4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2014/07/23 00:22:42 ryoon Exp $
+$NetBSD: distinfo,v 1.44 2015/09/08 18:51:27 joerg Exp $
 
 SHA1 (db-4.8.30.tar.gz) = ab36c170dda5b2ceaad3915ced96e41c6b7e493c
 RMD160 (db-4.8.30.tar.gz) = dd2fcd4c9b857a91e2f491fd4fadb0c51b993a9c
@@ -7,7 +7,12 @@ SHA1 (patch-aa) = 1004feec022eefbf3fd57b6d9af99edc5a2bf17a
 SHA1 (patch-ab) = 961c4ef5ad84739bd7eae57f407b89f42864b66e
 SHA1 (patch-ac) = 045a3b83b9c6c164382ec546b06ae248620552cf
 SHA1 (patch-ae) = 43e574154de93dba60392b09d6ebddbca1036849
-SHA1 (patch-dbinc_atomic.h) = ff60e3af41ac1b000ebccc91bc673adde5c7463b
+SHA1 (patch-dbinc_atomic.h) = d68db1b7e07b35ec070a18f0195b9f3b386114dd
 SHA1 (patch-dist_s__sig) = d891a6fabd27a07776bdaa21843563638ecb89f2
 SHA1 (patch-env_env__sig.c) = 93199a4147de946d1285fa006c751f4569f2cdb5
+SHA1 (patch-mp_mp__fget.c) = 697955fec5e492ba22c1bf6832527d115c3782ad
+SHA1 (patch-mp_mp__mvcc.c) = 72ceab20696d0391823c02b0f6b6cd485f40249b
+SHA1 (patch-mp_mp__region.c) = ac9f5934864b14027b417ab032679aee237208e3
+SHA1 (patch-mutex_mut__method.c) = 6134e13ea1d9c30e3f6ad61bd043f0add56f5c95
+SHA1 (patch-mutex_mut__tas.c) = a07b51a18d04cb3ab4abd5b0c675cf0170083210
 SHA1 (patch-repmgr_repmgr__posix.c) = 98ca8bbb1a82b02db2be6f0a69c5d74d8563fe74
diff --git a/databases/db4/patches/patch-dbinc_atomic.h b/databases/db4/patches/patch-dbinc_atomic.h
index 1ac36262a8a..ccf09f7be35 100644
--- a/databases/db4/patches/patch-dbinc_atomic.h
+++ b/databases/db4/patches/patch-dbinc_atomic.h
@@ -1,10 +1,21 @@
-$NetBSD: patch-dbinc_atomic.h,v 1.1 2012/05/29 20:18:28 joerg Exp $
+$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.
 
---- dbinc/atomic.h.orig	2012-05-24 10:38:34.000000000 +0000
+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)
@@ -36,3 +47,12 @@ This conflicts with Clang builtins.
  	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)
diff --git a/databases/db4/patches/patch-mp_mp__fget.c b/databases/db4/patches/patch-mp_mp__fget.c
new file mode 100644
index 00000000000..5090323ee65
--- /dev/null
+++ b/databases/db4/patches/patch-mp_mp__fget.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mp_mp__fget.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mp/mp_fget.c.orig	2015-08-29 23:35:11.000000000 +0000
++++ mp/mp_fget.c
+@@ -617,7 +617,7 @@ alloc:		/* Allocate a new buffer header 
+ 
+ 		/* Initialize enough so we can call __memp_bhfree. */
+ 		alloc_bhp->flags = 0;
+-		atomic_init(&alloc_bhp->ref, 1);
++		db_atomic_init(&alloc_bhp->ref, 1);
+ #ifdef DIAGNOSTIC
+ 		if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
+ 			__db_errx(env,
+@@ -911,7 +911,7 @@ alloc:		/* Allocate a new buffer header 
+ 			MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
+ 			    PROT_READ);
+ 
+-		atomic_init(&alloc_bhp->ref, 1);
++		db_atomic_init(&alloc_bhp->ref, 1);
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+ 		alloc_bhp->priority = bhp->priority;
+ 		alloc_bhp->pgno = bhp->pgno;
diff --git a/databases/db4/patches/patch-mp_mp__mvcc.c b/databases/db4/patches/patch-mp_mp__mvcc.c
new file mode 100644
index 00000000000..a89c562435a
--- /dev/null
+++ b/databases/db4/patches/patch-mp_mp__mvcc.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mp_mp__mvcc.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mp/mp_mvcc.c.orig	2015-08-29 23:35:09.000000000 +0000
++++ mp/mp_mvcc.c
+@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, n
+ #else
+ 	memcpy(frozen_bhp, bhp, SSZA(BH, buf));
+ #endif
+-	atomic_init(&frozen_bhp->ref, 0);
++	db_atomic_init(&frozen_bhp->ref, 0);
+ 	if (mutex != MUTEX_INVALID)
+ 		frozen_bhp->mtx_buf = mutex;
+ 	else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH,
+@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_b
+ #endif
+ 		alloc_bhp->mtx_buf = mutex;
+ 		MUTEX_LOCK(env, alloc_bhp->mtx_buf);
+-		atomic_init(&alloc_bhp->ref, 1);
++		db_atomic_init(&alloc_bhp->ref, 1);
+ 		F_CLR(alloc_bhp, BH_FROZEN);
+ 	}
+ 
diff --git a/databases/db4/patches/patch-mp_mp__region.c b/databases/db4/patches/patch-mp_mp__region.c
new file mode 100644
index 00000000000..b113d68201f
--- /dev/null
+++ b/databases/db4/patches/patch-mp_mp__region.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-mp_mp__region.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mp/mp_region.c.orig	2015-08-29 23:35:05.000000000 +0000
++++ mp/mp_region.c
+@@ -224,7 +224,7 @@ __memp_init(env, dbmp, reginfo_off, htab
+ 			     MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
+ 				return (ret);
+ 			SH_TAILQ_INIT(&htab[i].hash_bucket);
+-			atomic_init(&htab[i].hash_page_dirty, 0);
++			db_atomic_init(&htab[i].hash_page_dirty, 0);
+ 		}
+ 
+ 		/*
+@@ -269,7 +269,7 @@ __memp_init(env, dbmp, reginfo_off, htab
+ 		hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
+ 		    mtx_base + i;
+ 		SH_TAILQ_INIT(&hp->hash_bucket);
+-		atomic_init(&hp->hash_page_dirty, 0);
++		db_atomic_init(&hp->hash_page_dirty, 0);
+ #ifdef HAVE_STATISTICS
+ 		hp->hash_io_wait = 0;
+ 		hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0;
diff --git a/databases/db4/patches/patch-mutex_mut__method.c b/databases/db4/patches/patch-mutex_mut__method.c
new file mode 100644
index 00000000000..5264f4faf59
--- /dev/null
+++ b/databases/db4/patches/patch-mutex_mut__method.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-mutex_mut__method.c,v 1.1 2015/09/08 18:51:27 joerg Exp $
+
+--- mutex/mut_method.c.orig	2015-08-29 23:35:02.000000000 +0000
++++ mutex/mut_method.c
+@@ -426,7 +426,7 @@ atomic_compare_exchange(env, v, oldval, 
+ 	MUTEX_LOCK(env, mtx);
+ 	ret = atomic_read(v) == oldval;
+ 	if (ret)
+-		atomic_init(v, newval);
++		db_atomic_init(v, newval);
+ 	MUTEX_UNLOCK(env, mtx);
+ 
+ 	return (ret);