kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 23:39:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into dev3

Browse source
This commit is contained in:
daanx 2024-12-20 17:32:32 -08:00
commit 53857ddaa3
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/mimalloc/atomic.h
View file

@ -407,28 +407,34 @@ static inline void mi_atomic_yield(void) {
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Locks are only used for abandoned segment visiting in `arena.c` // Locks
// These do not have to be recursive and should be light-weight
// in-process only locks. Only used for reserving arena's and to
// maintain the abandoned list.
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
#if _MSC_VER
#pragma warning(disable:26110) // unlock with holding lock
#endif
#if defined(_WIN32) #if defined(_WIN32)
#define mi_lock_t CRITICAL_SECTION #define mi_lock_t SRWLOCK // slim reader-writer lock
static inline bool mi_lock_try_acquire(mi_lock_t* lock) { static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
return TryEnterCriticalSection(lock); return TryAcquireSRWLockExclusive(lock);
} }
static inline bool mi_lock_acquire(mi_lock_t* lock) { static inline bool mi_lock_acquire(mi_lock_t* lock) {
EnterCriticalSection(lock); AcquireSRWLockExclusive(lock);
return true; return true;
} }
static inline void mi_lock_release(mi_lock_t* lock) { static inline void mi_lock_release(mi_lock_t* lock) {
LeaveCriticalSection(lock); ReleaseSRWLockExclusive(lock);
} }
static inline void mi_lock_init(mi_lock_t* lock) { static inline void mi_lock_init(mi_lock_t* lock) {
InitializeCriticalSection(lock); InitializeSRWLock(lock);
} }
static inline void mi_lock_done(mi_lock_t* lock) { static inline void mi_lock_done(mi_lock_t* lock) {
DeleteCriticalSection(lock); // nothing
} }
@ -452,14 +458,13 @@ static inline void mi_lock_done(mi_lock_t* lock) {
pthread_mutex_destroy(lock); pthread_mutex_destroy(lock);
} }
/*
#elif defined(__cplusplus) #elif defined(__cplusplus)
#include <mutex> #include <mutex>
#define mi_lock_t std::mutex #define mi_lock_t std::mutex
static inline bool mi_lock_try_acquire(mi_lock_t* lock) { static inline bool mi_lock_try_acquire(mi_lock_t* lock) {
return lock->lock_try_acquire(); return lock->try_lock();
} }
static inline bool mi_lock_acquire(mi_lock_t* lock) { static inline bool mi_lock_acquire(mi_lock_t* lock) {
lock->lock(); lock->lock();
@ -474,7 +479,6 @@ static inline void mi_lock_init(mi_lock_t* lock) {
static inline void mi_lock_done(mi_lock_t* lock) { static inline void mi_lock_done(mi_lock_t* lock) {
(void)(lock); (void)(lock);
} }
*/
#else #else