3party/mimalloc
0
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-01-15 09:38:00 +08:00
Code Issues Projects Releases Wiki Activity

fix TSAN warning for statistics maximum, issue #130

Browse Source
This commit is contained in:
daan 2020-07-22 14:16:18 -07:00
parent 444afa934f
commit 8aa18d3661
2 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
include/mimalloc-atomic.h
View File

@ -65,10 +65,13 @@ static inline void mi_atomic_yield(void);
// Note: not using _Atomic(int64_t) as it is only used for statistics. // Note: not using _Atomic(int64_t) as it is only used for statistics.
static inline void mi_atomic_addi64(volatile int64_t* p, int64_t add); static inline void mi_atomic_addi64(volatile int64_t* p, int64_t add);
// Atomically take the maximum a 64-bit value; returns the previous value. // Atomically update `*p` with the maximum of `*p` and `x` as a 64-bit value.
// Note: not using _Atomic(int64_t) as it is only used for statistics. // Returns the previous value. Note: not using _Atomic(int64_t) as it is only used for statistics.
static inline void mi_atomic_maxi64(volatile int64_t* p, int64_t x); static inline void mi_atomic_maxi64(volatile int64_t* p, int64_t x);
// Atomically read a 64-bit value
// Note: not using _Atomic(int64_t) as it is only used for statistics.
static inline int64_t mi_atomic_readi64(volatile int64_t* p);
// Atomically subtract a value; returns the previous value. // Atomically subtract a value; returns the previous value.
static inline uintptr_t mi_atomic_sub(volatile _Atomic(uintptr_t)* p, uintptr_t sub) { static inline uintptr_t mi_atomic_sub(volatile _Atomic(uintptr_t)* p, uintptr_t sub) {
@ -188,23 +191,24 @@ static inline void mi_atomic_maxi64(volatile _Atomic(int64_t)*p, int64_t x) {
} while (current < x && _InterlockedCompareExchange64(p, x, current) != current); } while (current < x && _InterlockedCompareExchange64(p, x, current) != current);
} }
static inline int64_t mi_atomic_readi64(volatile _Atomic(int64_t)*p) {
#ifdef _WIN64
return *p;
#else
int64_t current;
do {
current = *p;
} while (_InterlockedCompareExchange64(p, current, current) != current);
return current;
#endif
}
#else #else
#ifdef __cplusplus #ifdef __cplusplus
#define MI_USING_STD using namespace std; #define MI_USING_STD using namespace std;
#else #else
#define MI_USING_STD #define MI_USING_STD
#endif #endif
static inline void mi_atomic_addi64(volatile int64_t* p, int64_t add) {
MI_USING_STD
atomic_fetch_add_explicit((volatile _Atomic(int64_t)*)p, add, memory_order_relaxed);
}
static inline void mi_atomic_maxi64(volatile int64_t* p, int64_t x) {
MI_USING_STD
int64_t current;
do {
current = atomic_load_explicit((volatile _Atomic(int64_t)*)p, memory_order_relaxed);
} while (current < x && !atomic_compare_exchange_weak_explicit((volatile _Atomic(int64_t)*)p, &current, x, memory_order_acq_rel, memory_order_relaxed));
}
static inline uintptr_t mi_atomic_add(volatile _Atomic(uintptr_t)* p, uintptr_t add) { static inline uintptr_t mi_atomic_add(volatile _Atomic(uintptr_t)* p, uintptr_t add) {
MI_USING_STD MI_USING_STD
return atomic_fetch_add_explicit(p, add, memory_order_relaxed); return atomic_fetch_add_explicit(p, add, memory_order_relaxed);
@ -241,6 +245,21 @@ static inline void mi_atomic_write(volatile _Atomic(uintptr_t)* p, uintptr_t x)
MI_USING_STD MI_USING_STD
return atomic_store_explicit(p, x, memory_order_release); return atomic_store_explicit(p, x, memory_order_release);
} }
static inline void mi_atomic_addi64(volatile int64_t* p, int64_t add) {
MI_USING_STD
atomic_fetch_add_explicit((volatile _Atomic(int64_t)*)p, add, memory_order_relaxed);
}
static inline int64_t mi_atomic_readi64(volatile int64_t* p) {
MI_USING_STD
return atomic_load_explicit((volatile _Atomic(int64_t)*) p, memory_order_relaxed);
}
static inline void mi_atomic_maxi64(volatile int64_t* p, int64_t x) {
MI_USING_STD
int64_t current;
do {
current = mi_atomic_readi64(p);
} while (current < x && !atomic_compare_exchange_weak_explicit((volatile _Atomic(int64_t)*)p, &current, x, memory_order_acq_rel, memory_order_relaxed));
}
#if defined(__cplusplus) #if defined(__cplusplus)
#include <thread> #include <thread>

2
src/stats.c
View File

@ -27,7 +27,7 @@ static void mi_stat_update(mi_stat_count_t* stat, int64_t amount) {
{ {
// add atomically (for abandoned pages) // add atomically (for abandoned pages)
mi_atomic_addi64(&stat->current,amount); mi_atomic_addi64(&stat->current,amount);
mi_atomic_maxi64(&stat->peak, stat->current); mi_atomic_maxi64(&stat->peak, mi_atomic_readi64(&stat->current));
if (amount > 0) { if (amount > 0) {
mi_atomic_addi64(&stat->allocated,amount); mi_atomic_addi64(&stat->allocated,amount);
} }