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

7 files changed, 130 insertions, 2 deletions

diff --git a/databases/db6/distinfo b/databases/db6/distinfo
index 5229f663113..21af3e8dafe 100644
--- a/databases/db6/distinfo
+++ b/databases/db6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/01/01 18:52:52 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2015/09/08 18:51:28 joerg Exp $
 
 SHA1 (db-6.1.19.tar.gz) = e266f8ab73f4f1ea276d203ce85426e5a6831501
 RMD160 (db-6.1.19.tar.gz) = fcb5fbe20e18339e18a244afbcfa13819aecad36
@@ -6,5 +6,10 @@ Size (db-6.1.19.tar.gz) = 37492835 bytes
 SHA1 (patch-dist_Makefile.in) = dbc5f8fd26e715f6dff8ff261a08b2856ea3c46e
 SHA1 (patch-dist_aclocal_libtool.m4) = 37367e10d9d856cf233b7a0efd3680f35728039e
 SHA1 (patch-dist_configure) = 2fb4c6cdd29ac5a9ad520af411517660b24e8768
-SHA1 (patch-src_dbinc_atomic.h) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-src_dbinc_atomic.h) = 240a4a6ec094e868d9a5e95ec4ab72d5b9ddfc23
 SHA1 (patch-src_hmac_sha1.c) = 0e98e6383c214adbb939839bb345e55efe8d89da
+SHA1 (patch-src_mp_mp__fget.c) = 059ecdb74bef29c17b445c305b6d4934b5a3c59b
+SHA1 (patch-src_mp_mp__mvcc.c) = 7a543c4e56d72bba607d6e8ec6b667b944e418f1
+SHA1 (patch-src_mp_mp__region.c) = bba0d8e3046d5d571ec00e8b07d7d10a375e6057
+SHA1 (patch-src_mutex_mut__method.c) = 5a8695160913f6a70be39c02aff7a4c7240fec6b
+SHA1 (patch-src_mutex_mut__tas.c) = 3bf893026bfc0878fe35050b8339c5a6a59f95e6
diff --git a/databases/db6/patches/patch-src_dbinc_atomic.h b/databases/db6/patches/patch-src_dbinc_atomic.h
index e69de29bb2d..8d3125f86bd 100644
--- a/databases/db6/patches/patch-src_dbinc_atomic.h
+++ b/databases/db6/patches/patch-src_dbinc_atomic.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_dbinc_atomic.h,v 1.2 2015/09/08 18:51:28 joerg Exp $
+
+--- src/dbinc/atomic.h.orig	2015-09-02 11:18:22.000000000 +0000
++++ src/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
+ 
+@@ -205,7 +205,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/db6/patches/patch-src_mp_mp__fget.c b/databases/db6/patches/patch-src_mp_mp__fget.c
new file mode 100644
index 00000000000..bc41cea4136
--- /dev/null
+++ b/databases/db6/patches/patch-src_mp_mp__fget.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__fget.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_fget.c.orig	2015-09-02 11:18:18.000000000 +0000
++++ src/mp/mp_fget.c
+@@ -654,7 +654,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, DB_STR("3025",
+@@ -969,7 +969,7 @@ alloc:		/* Allocate a new buffer header 
+ 			MVCC_MPROTECT(bhp->buf, mfp->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/db6/patches/patch-src_mp_mp__mvcc.c b/databases/db6/patches/patch-src_mp_mp__mvcc.c
new file mode 100644
index 00000000000..58f73ae2e93
--- /dev/null
+++ b/databases/db6/patches/patch-src_mp_mp__mvcc.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__mvcc.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_mvcc.c.orig	2015-09-02 11:18:15.000000000 +0000
++++ src/mp/mp_mvcc.c
+@@ -281,7 +281,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,
+@@ -440,7 +440,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/db6/patches/patch-src_mp_mp__region.c b/databases/db6/patches/patch-src_mp_mp__region.c
new file mode 100644
index 00000000000..8e6ff5fa800
--- /dev/null
+++ b/databases/db6/patches/patch-src_mp_mp__region.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mp_mp__region.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mp/mp_region.c.orig	2015-09-02 11:18:13.000000000 +0000
++++ src/mp/mp_region.c
+@@ -278,7 +278,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);
+ 		}
+ 
+ 		mtx_base = mtx_prev = MUTEX_INVALID;
+@@ -332,7 +332,7 @@ no_prealloc:
+ 		    DB_MUTEX_SHARED, &hp->mtx_hash)) != 0)
+ 			return (ret);
+ 		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/db6/patches/patch-src_mutex_mut__method.c b/databases/db6/patches/patch-src_mutex_mut__method.c
new file mode 100644
index 00000000000..606dcff2660
--- /dev/null
+++ b/databases/db6/patches/patch-src_mutex_mut__method.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mutex_mut__method.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mutex/mut_method.c.orig	2015-09-02 11:18:11.000000000 +0000
++++ src/mutex/mut_method.c
+@@ -501,7 +501,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);
diff --git a/databases/db6/patches/patch-src_mutex_mut__tas.c b/databases/db6/patches/patch-src_mutex_mut__tas.c
new file mode 100644
index 00000000000..ef9185aab44
--- /dev/null
+++ b/databases/db6/patches/patch-src_mutex_mut__tas.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mutex_mut__tas.c,v 1.1 2015/09/08 18:51:28 joerg Exp $
+
+--- src/mutex/mut_tas.c.orig	2015-09-02 11:18:09.000000000 +0000
++++ src/mutex/mut_tas.c
+@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
+ 
+ #ifdef HAVE_SHARED_LATCHES
+ 	if (F_ISSET(mutexp, DB_MUTEX_SHARED))
+-		atomic_init(&mutexp->sharecount, 0);
++		db_atomic_init(&mutexp->sharecount, 0);
+ 	else
+ #endif
+ 	if (MUTEX_INIT(&mutexp->tas)) {
+@@ -642,7 +642,7 @@ was_not_locked:
+ 			F_CLR(mutexp, DB_MUTEX_LOCKED);
+ 			/* Flush flag update before zeroing count */
+ 			MEMBAR_EXIT();
+-			atomic_init(&mutexp->sharecount, 0);
++			db_atomic_init(&mutexp->sharecount, 0);
+ 		} else {
+ 			DB_ASSERT(env, sharecount > 0);
+ 			MEMBAR_EXIT();