ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-06 18:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: make internal 'atomics' compatible with C++.

Browse Source 
Change-Id: I1381f477e977edf4bf56871a2e34af1b302867a0
This commit is contained in:
Leo Yuriev 2017-07-26 17:34:59 +03:00
parent fb9d7a4471
commit 336bef7e51
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osal.h
View File

@ -515,7 +515,8 @@ int mdbx_rpid_check(MDBX_env *env, mdbx_pid_t pid);
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* Atomics */ /* Atomics */
#if (__STDC_VERSION__ >= 201112L) && !defined(__STDC_NO_ATOMICS__) && \ #if !defined(__cplusplus) && (__STDC_VERSION__ >= 201112L) && \
!defined(__STDC_NO_ATOMICS__) && \
(__GNUC_PREREQ(4, 9) || __CLANG_PREREQ(3, 8) || \ (__GNUC_PREREQ(4, 9) || __CLANG_PREREQ(3, 8) || \
!(defined(__GNUC__) || defined(__clang__))) !(defined(__GNUC__) || defined(__clang__)))
#include <stdatomic.h> #include <stdatomic.h>
@ -538,7 +539,7 @@ int mdbx_rpid_check(MDBX_env *env, mdbx_pid_t pid);
#endif #endif
static __inline uint32_t mdbx_atomic_add32(volatile uint32_t *p, uint32_t v) { static __inline uint32_t mdbx_atomic_add32(volatile uint32_t *p, uint32_t v) {
#if defined(ATOMIC_VAR_INIT) #if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT)
assert(atomic_is_lock_free(p)); assert(atomic_is_lock_free(p));
return atomic_fetch_add((_Atomic uint32_t *)p, v); return atomic_fetch_add((_Atomic uint32_t *)p, v);
#elif defined(__GNUC__) || defined(__clang__) #elif defined(__GNUC__) || defined(__clang__)
@ -554,7 +555,7 @@ static __inline uint32_t mdbx_atomic_add32(volatile uint32_t *p, uint32_t v) {
} }
static __inline uint64_t mdbx_atomic_add64(volatile uint64_t *p, uint64_t v) { static __inline uint64_t mdbx_atomic_add64(volatile uint64_t *p, uint64_t v) {
#ifdef ATOMIC_VAR_INIT #if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT)
assert(atomic_is_lock_free(p)); assert(atomic_is_lock_free(p));
return atomic_fetch_add((_Atomic uint64_t *)p, v); return atomic_fetch_add((_Atomic uint64_t *)p, v);
#elif defined(__GNUC__) || defined(__clang__) #elif defined(__GNUC__) || defined(__clang__)
@ -569,12 +570,12 @@ static __inline uint64_t mdbx_atomic_add64(volatile uint64_t *p, uint64_t v) {
#endif #endif
} }
#define mdbx_atomic_sub32(p, v) mdbx_atomic_add32(p, -(v)) #define mdbx_atomic_sub32(p, v) mdbx_atomic_add32(p, 0 - (v))
#define mdbx_atomic_sub64(p, v) mdbx_atomic_add64(p, -(v)) #define mdbx_atomic_sub64(p, v) mdbx_atomic_add64(p, 0 - (v))
static __inline bool mdbx_atomic_compare_and_swap32(volatile uint32_t *p, static __inline bool mdbx_atomic_compare_and_swap32(volatile uint32_t *p,
uint32_t c, uint32_t v) { uint32_t c, uint32_t v) {
#ifdef ATOMIC_VAR_INIT #if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT)
assert(atomic_is_lock_free(p)); assert(atomic_is_lock_free(p));
return atomic_compare_exchange_strong((_Atomic uint32_t *)p, &c, v); return atomic_compare_exchange_strong((_Atomic uint32_t *)p, &c, v);
#elif defined(__GNUC__) || defined(__clang__) #elif defined(__GNUC__) || defined(__clang__)
@ -591,7 +592,7 @@ static __inline bool mdbx_atomic_compare_and_swap32(volatile uint32_t *p,
static __inline bool mdbx_atomic_compare_and_swap64(volatile uint64_t *p, static __inline bool mdbx_atomic_compare_and_swap64(volatile uint64_t *p,
uint64_t c, uint64_t v) { uint64_t c, uint64_t v) {
#ifdef ATOMIC_VAR_INIT #if !defined(__cplusplus) && defined(ATOMIC_VAR_INIT)
assert(atomic_is_lock_free(p)); assert(atomic_is_lock_free(p));
return atomic_compare_exchange_strong((_Atomic uint64_t *)p, &c, v); return atomic_compare_exchange_strong((_Atomic uint64_t *)p, &c, v);
#elif defined(__GNUC__) || defined(__clang__) #elif defined(__GNUC__) || defined(__clang__)