Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
4.2 kB · 123 lines
123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.hindex e4420aa..4799b5f 100644--- a/src/dbinc/atomic.h+++ b/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 atomic_init_db(p, val) ((p)->value = (val)) #ifdef HAVE_ATOMIC_SUPPORT @@ -225,7 +225,7 @@ static inline int __atomic_compare_exchange_int( #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)+ atomic_init_db(p, (newval)), 1) #else #define atomic_inc(env, p) __atomic_inc_int(env, p) #define atomic_dec(env, p) __atomic_dec_int(env, p)diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.cindex 59fe9fe..fa4ced7 100644--- a/src/mp/mp_fget.c+++ b/src/mp/mp_fget.c@@ -654,7 +654,7 @@ alloc: /* Allocate a new buffer header and data space. */ /* Initialize enough so we can call __memp_bhfree. */ alloc_bhp->flags = 0;- atomic_init(&alloc_bhp->ref, 1);+ atomic_init_db(&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 and data space. */ MVCC_MPROTECT(bhp->buf, mfp->pagesize, PROT_READ); - atomic_init(&alloc_bhp->ref, 1);+ atomic_init_db(&alloc_bhp->ref, 1); MUTEX_LOCK(env, alloc_bhp->mtx_buf); alloc_bhp->priority = bhp->priority; alloc_bhp->pgno = bhp->pgno;diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.cindex 83c4d72..0a47202 100644--- a/src/mp/mp_mvcc.c+++ b/src/mp/mp_mvcc.c@@ -281,7 +281,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) #else memcpy(frozen_bhp, bhp, SSZA(BH, buf)); #endif- atomic_init(&frozen_bhp->ref, 0);+ atomic_init_db(&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_bhp, alloc_bhp) #endif alloc_bhp->mtx_buf = mutex; MUTEX_LOCK(env, alloc_bhp->mtx_buf);- atomic_init(&alloc_bhp->ref, 1);+ atomic_init_db(&alloc_bhp->ref, 1); F_CLR(alloc_bhp, BH_FROZEN); } diff --git a/src/mp/mp_region.c b/src/mp/mp_region.cindex 4d95e4f..e97459c 100644--- a/src/mp/mp_region.c+++ b/src/mp/mp_region.c@@ -278,7 +278,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) 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);+ atomic_init_db(&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);+ atomic_init_db(&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/src/mutex/mut_method.c b/src/mutex/mut_method.cindex 72b34de..a9f9868 100644--- a/src/mutex/mut_method.c+++ b/src/mutex/mut_method.c@@ -501,7 +501,7 @@ __atomic_compare_exchange_int(env, v, oldval, newval) MUTEX_LOCK(env, mtx); ret = atomic_read(v) == oldval; if (ret)- atomic_init(v, newval);+ atomic_init_db(v, newval); MUTEX_UNLOCK(env, mtx); return (ret);diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.cindex 7899c4b..d9420fa 100644--- a/src/mutex/mut_tas.c+++ b/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);+ atomic_init_db(&mutexp->sharecount, 0); else #endif if (MUTEX_INIT(&mutexp->tas)) {@@ -643,7 +643,7 @@ was_not_locked: F_CLR(mutexp, DB_MUTEX_LOCKED); /* Flush flag update before zeroing count */ MEMBAR_EXIT();- atomic_init(&mutexp->sharecount, 0);+ atomic_init_db(&mutexp->sharecount, 0); } else { DB_ASSERT(env, sharecount > 0); MEMBAR_EXIT();