<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6fafe439c4af869b3c70b21bbb8f6d18e7550ddc">https://github.com/macports/macports-ports/commit/6fafe439c4af869b3c70b21bbb8f6d18e7550ddc</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6fafe439c4af869b3c70b21bbb8f6d18e7550ddc
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 11 14:50:01 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> db48: ensure patches apply cleanly
</span>---
databases/db48/files/patch-dbinc_atomic.h | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/db48/files/patch-dbinc_atomic.h b/databases/db48/files/patch-dbinc_atomic.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 13da5ba486f..e1e87a10b03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/db48/files/patch-dbinc_atomic.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/db48/files/patch-dbinc_atomic.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ diff --git mp/mp_fget.c mp/mp_fget.c
</span> index 16de695..d0dcc29 100644
--- mp/mp_fget.c
+++ mp/mp_fget.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -617,7 +617,7 @@
</span>
/* Initialize enough so we can call __memp_bhfree. */
alloc_bhp->flags = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,9 +53,9 @@ index 16de695..d0dcc29 100644
</span> + atomic_init_db(&alloc_bhp->ref, 1);
#ifdef DIAGNOSTIC
if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- __db_errx(env, DB_STR("3025",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MVCC_MPROTECT(bhp->buf, mfp->pagesize,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __db_errx(env,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -911,7 +911,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MVCC_MPROTECT(bhp->buf, mfp->stat.st_pagesize,
</span> PROT_READ);
- atomic_init(&alloc_bhp->ref, 1);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ diff --git mp/mp_region.c mp/mp_region.c
</span> index 4952030..47645f8 100644
--- mp/mp_region.c
+++ mp/mp_region.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -224,7 +224,7 @@
</span> MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0)
return (ret);
SH_TAILQ_INIT(&htab[i].hash_bucket);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +98,9 @@ index 4952030..47645f8 100644
</span> }
/*
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,7 +302,7 @@ no_prealloc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -269,7 +269,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hp->mtx_hash = (mtx_base == MUTEX_INVALID) ? MUTEX_INVALID :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mtx_base + i;
</span> SH_TAILQ_INIT(&hp->hash_bucket);
- atomic_init(&hp->hash_page_dirty, 0);
+ atomic_init_db(&hp->hash_page_dirty, 0);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,7 +111,7 @@ diff --git mutex/mut_method.c mutex/mut_method.c
</span> index 09353b0..177353c 100644
--- mutex/mut_method.c
+++ mutex/mut_method.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -426,7 +426,7 @@
</span> MUTEX_LOCK(env, mtx);
ret = atomic_read(v) == oldval;
if (ret)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +124,7 @@ diff --git mutex/mut_tas.c mutex/mut_tas.c
</span> index 106b161..fc4de9d 100644
--- mutex/mut_tas.c
+++ mutex/mut_tas.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,7 +46,7 @@
</span>
#ifdef HAVE_SHARED_LATCHES
if (F_ISSET(mutexp, DB_MUTEX_SHARED))
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +133,7 @@ index 106b161..fc4de9d 100644
</span> else
#endif
if (MUTEX_INIT(&mutexp->tas)) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -486,7 +486,7 @@
</span> F_CLR(mutexp, DB_MUTEX_LOCKED);
/* Flush flag update before zeroing count */
MEMBAR_EXIT();
</pre><pre style='margin:0'>
</pre>