a

Author: bratpiorka

src/utils/utils_concurrency.h

@@ -24,19 +24,6 @@
 #else
 #include <pthread.h>
 
-#ifndef __cplusplus
-#include <stdatomic.h>
-#else /* __cplusplus */
-#include <atomic>
-#define _Atomic(X) std::atomic<X>
-
-using std::memory_order_acq_rel;
-using std::memory_order_acquire;
-using std::memory_order_relaxed;
-using std::memory_order_release;
-
-#endif /* __cplusplus */
-
 #endif /* _WIN32 */
 
 #include "utils_common.h"
@@ -118,14 +105,6 @@ static __inline void utils_atomic_load_acquire_ptr(void **ptr, void **out) {
     *(uintptr_t *)out = ret;
 }
 
-static __inline void utils_atomic_store_release_u64(uint64_t *ptr,
-                                                    uint64_t *val) {
-    ASSERT_IS_ALIGNED((uintptr_t)ptr, 8);
-    ASSERT_IS_ALIGNED((uintptr_t)val, 8);
-    utils_annotate_release(ptr);
-    InterlockedExchange64((LONG64 volatile *)ptr, *(LONG64 *)val);
-}
-
 static __inline void utils_atomic_store_release_ptr(void **ptr, void *val) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 8);
     utils_annotate_release(ptr);
@@ -146,14 +125,12 @@ static __inline uint64_t utils_atomic_decrement_u64(uint64_t *ptr) {
 
 static __inline uint64_t utils_fetch_and_add_u64(uint64_t *ptr, uint64_t val) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 8);
-    ASSERT_IS_ALIGNED((uintptr_t)&val, 8);
     // return the value that had previously been in *ptr
     return InterlockedExchangeAdd64((LONG64 volatile *)(ptr), val);
 }
 
 static __inline uint64_t utils_fetch_and_sub_u64(uint64_t *ptr, uint64_t val) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 8);
-    ASSERT_IS_ALIGNED((uintptr_t)&val, 8);
     // return the value that had previously been in *ptr
     // NOTE: on Windows there is no *Sub* version of InterlockedExchange
     return InterlockedExchangeAdd64((LONG64 volatile *)(ptr), -(LONG64)val);
@@ -203,14 +180,6 @@ static inline void utils_atomic_load_acquire_ptr(void **ptr, void **out) {
     utils_annotate_acquire((void *)ptr);
 }
 
-static inline void utils_atomic_store_release_u64(uint64_t *ptr,
-                                                  uint64_t *val) {
-    ASSERT_IS_ALIGNED((uintptr_t)ptr, 8);
-    ASSERT_IS_ALIGNED((uintptr_t)val, 8);
-    utils_annotate_release(ptr);
-    __atomic_store(ptr, val, memory_order_release);
-}
-
 static inline void utils_atomic_store_release_ptr(void **ptr, void *val) {
     ASSERT_IS_ALIGNED((uintptr_t)ptr, 8);
     utils_annotate_release(ptr);

test/common/base.hpp

@@ -12,6 +12,11 @@
 
 #include <gtest/gtest.h>
 
+using std::memory_order_acq_rel;
+using std::memory_order_acquire;
+using std::memory_order_relaxed;
+using std::memory_order_release;
+
 namespace umf_test {
 
 #define IS_SKIPPED_OR_FAILED() (HasFatalFailure() || IsSkipped())