mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 05:57:52 +00:00
Code Issues Releases Wiki Activity

add atomic_exchange operations to mutexatomic.h and win32 stdatomic.h

Browse Source
This commit is contained in:
Witold Kręcicki 2019-10-24 10:55:54 +02:00 committed by Evan Hunt
parent 59c64fa4bd
commit a85a65f96e
3 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/isc/include/isc/mutexatomic.h
View File

@ -93,6 +93,11 @@ typedef struct atomic_uint_fast64 {
uint64_t v; uint64_t v;
} atomic_uint_fast64_t; } atomic_uint_fast64_t;
typedef struct atomic_uintptr {
isc_mutex_t m;
uintptr_t v;
} atomic_uintptr_t;
typedef struct atomic_bool_s { typedef struct atomic_bool_s {
isc_mutex_t m; isc_mutex_t m;
bool v; bool v;
@ -198,3 +203,14 @@ typedef struct atomic_bool_s {
atomic_compare_exchange_weak_explicit(obj, expected, desired, \ atomic_compare_exchange_weak_explicit(obj, expected, desired, \
memory_order_seq_cst, \ memory_order_seq_cst, \
memory_order_seq_cst) memory_order_seq_cst)
#define atomic_exchange_explicit(obj, desired, order) \
({ \
typeof((obj)->v) ___v; \
REQUIRE(isc_mutex_lock(&(obj)->m) == ISC_R_SUCCESS); \
___v = (obj)->v; \
(obj)->v = desired; \
REQUIRE(isc_mutex_unlock(&(obj)->m) == ISC_R_SUCCESS); \
___v; \
})
#define atomic_exchange(obj, desired) \
atomic_exchange_explicit(obj, desired, memory_order_seq_cst)

11
lib/isc/unix/include/isc/stdatomic.h
View File

@ -80,6 +80,8 @@ typedef int_fast64_t atomic_int_fast64_t;
typedef uint_fast64_t atomic_uint_fast64_t; typedef uint_fast64_t atomic_uint_fast64_t;
typedef bool atomic_bool; typedef bool atomic_bool;
typedef uint_fast64_t atomic_uintptr_t;
#if defined(__CLANG_ATOMICS) /* __c11_atomic builtins */ #if defined(__CLANG_ATOMICS) /* __c11_atomic builtins */
#define atomic_init(obj, desired) \ #define atomic_init(obj, desired) \
__c11_atomic_init(obj, desired) __c11_atomic_init(obj, desired)
@ -99,6 +101,8 @@ typedef bool atomic_bool;
__c11_atomic_compare_exchange_strong_explicit(obj, expected, desired, succ, fail) __c11_atomic_compare_exchange_strong_explicit(obj, expected, desired, succ, fail)
#define atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) \ #define atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) \
__c11_atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) __c11_atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail)
#define atomic_exchange_explicit(obj, desired, order) \
__c11_atomic_exchange_explicit(obj, expected, order)
#elif defined(__GNUC_ATOMICS) /* __atomic builtins */ #elif defined(__GNUC_ATOMICS) /* __atomic builtins */
#define atomic_init(obj, desired) \ #define atomic_init(obj, desired) \
(*obj = desired) (*obj = desired)
@ -118,6 +122,8 @@ typedef bool atomic_bool;
__atomic_compare_exchange_n(obj, expected, desired, 0, succ, fail) __atomic_compare_exchange_n(obj, expected, desired, 0, succ, fail)
#define atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) \ #define atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) \
__atomic_compare_exchange_n(obj, expected, desired, 1, succ, fail) __atomic_compare_exchange_n(obj, expected, desired, 1, succ, fail)
#define atomic_exchange_explicit(obj, desired, order) \
__atomic_exchange_n(obj, desired, order)
#else /* __sync builtins */ #else /* __sync builtins */
#define atomic_init(obj, desired) \ #define atomic_init(obj, desired) \
(*obj = desired) (*obj = desired)
@ -150,6 +156,9 @@ typedef bool atomic_bool;
}) })
#define atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) \ #define atomic_compare_exchange_weak_explicit(obj, expected, desired, succ, fail) \
atomic_compare_exchange_strong_explicit(obj, expected, desired, succ, fail) atomic_compare_exchange_strong_explicit(obj, expected, desired, succ, fail)
#define atomic_exchange_explicit(obj, desired, order) \
__sync_lock_test_and_set(obj, desired)
#endif #endif
#define atomic_load(obj) \ #define atomic_load(obj) \
@ -168,3 +177,5 @@ typedef bool atomic_bool;
atomic_compare_exchange_strong_explicit(obj, expected, desired, memory_order_seq_cst, memory_order_seq_cst) atomic_compare_exchange_strong_explicit(obj, expected, desired, memory_order_seq_cst, memory_order_seq_cst)
#define atomic_compare_exchange_weak(obj, expected, desired) \ #define atomic_compare_exchange_weak(obj, expected, desired) \
atomic_compare_exchange_weak_explicit(obj, expected, desired, memory_order_seq_cst, memory_order_seq_cst) atomic_compare_exchange_weak_explicit(obj, expected, desired, memory_order_seq_cst, memory_order_seq_cst)
#define atomic_exchange(obj, desired) \
atomic_exchange_explicit(obj, desired, memory_order_seq_cst)

23
lib/isc/win32/include/isc/stdatomic.h
View File

@ -397,8 +397,7 @@ atomic_compare_exchange_strong_explicit64(atomic_int_fast64_t *obj,
return (__r); return (__r);
} }
static inline static inline bool
bool
atomic_compare_exchange_abort() { atomic_compare_exchange_abort() {
INSIST(0); INSIST(0);
ISC_UNREACHABLE(); ISC_UNREACHABLE();
@ -434,3 +433,23 @@ atomic_compare_exchange_abort() {
atomic_compare_exchange_weak_explicit(obj, expected, desired, \ atomic_compare_exchange_weak_explicit(obj, expected, desired, \
memory_order_seq_cst, \ memory_order_seq_cst, \
memory_order_seq_cst) memory_order_seq_cst)
static inline
bool
atomic_exchange_abort() {
INSIST(0);
ISC_UNREACHABLE();
}
#define atomic_exchange_explicit(obj, desired, order) \
(sizeof(*(obj)) == 8 \
? InterlockedExchange64(obj, desired) \
: (sizeof(*(obj)) == 4 \
? InterlockedExchange(obj, desired) \
: (sizeof(*(obj)) == 1 \
? InterlockedExchange8(obj, desired) \
: atomic_exchange_abort())))
#define atomic_exchange(obj, desired) \
atomic_exchange_explicit(obj, desired, memory_order_seq_cst) \