Skip to content

add MI_APPLE_TLS_THREAD_LOCAL option to use THREAD_LOCAL on macOS #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shulaoda wants to merge 1 commit into
base: dev3
Choose a base branch
from
+14 −1
Open

add MI_APPLE_TLS_THREAD_LOCAL option to use THREAD_LOCAL on macOS #1302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion include/mimalloc/prim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,8 +367,21 @@ This incurs an extra check in the fast path (but can often be combined in an exi
static inline mi_theap_t* _mi_theap_default(void);
static inline mi_theap_t* _mi_theap_cached(void);

// Set MI_APPLE_TLS_THREAD_LOCAL=1 to use THREAD_LOCAL + RECURSE_GUARD on Apple
// instead of the default FIXED_SLOT. Needed when multiple images in one process
// each statically link mimalloc (e.g. Node.js napi addons via dlopen), since
// FIXED_SLOT uses a hardcoded TCB slot shared across all images.
#ifndef MI_APPLE_TLS_THREAD_LOCAL
#define MI_APPLE_TLS_THREAD_LOCAL 0
#endif

#if defined(_WIN32)
#define MI_TLS_MODEL_DYNAMIC_WIN32 1
#define MI_TLS_MODEL_DYNAMIC_WIN32 1
#elif defined(__APPLE__) && MI_APPLE_TLS_THREAD_LOCAL && !defined(__POWERPC__) // macOS: opt-in thread local
#define MI_TLS_MODEL_THREAD_LOCAL 1
#ifndef MI_TLS_RECURSE_GUARD
#define MI_TLS_RECURSE_GUARD 1
#endif
#elif defined(__APPLE__) && MI_HAS_TLS_SLOT && !defined(__POWERPC__) // macOS on arm64 or x64
// #define MI_TLS_MODEL_DYNAMIC_PTHREADS 1 // also works but a bit slower
#define MI_TLS_MODEL_FIXED_SLOT 1
Expand Down