casa-mp-base

http://www.databaseusers.com/article/6047407/Bug%3A+Build+failure+on+Linux+with+clang+libc%2B%2B+(atomic+issues)

https://gist.githubusercontent.com/LnL7/5153b251fd525fe15de69b67e63a6075/raw/7778e9364679093a32dec2908656738e16b6bdcb/clang.patch

​

diff --git src/dbinc/atomic.h src/dbinc/atomic.h

index 6a858f7..9f338dc 100644

--- src/dbinc/atomic.h

+++ 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

@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange(

 #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(env, p)

 #define atomic_dec(env, p) __atomic_dec(env, p)

diff --git src/mp/mp_fget.c src/mp/mp_fget.c

index 16de695..d0dcc29 100644

--- src/mp/mp_fget.c

+++ src/mp/mp_fget.c

@@ -649,7 +649,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",

@@ -955,7 +955,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 src/mp/mp_mvcc.c src/mp/mp_mvcc.c

index 770bad8..e28cce0 100644

--- src/mp/mp_mvcc.c

+++ src/mp/mp_mvcc.c

@@ -276,7 +276,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,

@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp)

 #endif

        alloc_bhp->mtx_buf = mutex;