a

Author: bratpiorka

benchmark/benchmark.cpp

@@ -96,7 +96,6 @@ UMF_BENCHMARK_TEMPLATE_DEFINE(multiple_malloc_free_benchmark,
                               pool_allocator<disjoint_pool<os_provider>>);
 UMF_BENCHMARK_REGISTER_F(multiple_malloc_free_benchmark, disjoint_pool_uniform)
     ->Apply(&default_multiple_alloc_uniform_size)
-    ->Apply(&singlethreaded)
     ->Apply(&multithreaded);
 
 #ifdef UMF_POOL_JEMALLOC_ENABLED

src/critnib/critnib.c

@@ -119,7 +119,6 @@ struct critnib_leaf {
 
 struct critnib {
     struct critnib_node *root;
-    uint64_t remove_count;
 
     /* pool of freed nodes: singly linked list, next at child[0] */
     struct critnib_node *deleted_node;
@@ -129,6 +128,8 @@ struct critnib {
     struct critnib_node *pending_del_nodes[DELETED_LIFE];
     struct critnib_leaf *pending_del_leaves[DELETED_LIFE];
 
+    uint64_t remove_count;
+
     struct utils_mutex_t mutex; /* writes/removes */
 };
 

src/pool/pool_disjoint.c

@@ -444,7 +444,6 @@ static bool bucket_can_pool(bucket_t *bucket) {
             &bucket->shared_limits->total_size, size_to_add);
 
         if (previous_size + size_to_add <= bucket->shared_limits->max_size) {
-
             ++bucket->chunked_slabs_in_pool;
             bucket_update_stats(bucket, -1, 1);
             return true;

src/utils/utils_concurrency.h

@@ -21,23 +21,12 @@
 #include "utils_windows_intrin.h"
 
 #pragma intrinsic(_BitScanForward64)
-#else
-#include <pthread.h>
+#else // !_WIN32
 
-#ifndef __cplusplus
+#include <pthread.h>
 #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 */
+#endif /* !_WIN32 */
 
 #include "utils_common.h"
 #include "utils_sanitizers.h"
@@ -118,14 +107,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 +127,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 +182,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())