kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-14 11:09:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix TLS initialization for MI_WIN_USE_FIXED_TLS with redirection

Browse source
This commit is contained in:
daanx 2025-05-05 10:23:52 -07:00
parent e2d7c24c73
commit c84d996e88
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mimalloc/prim.h
View file

@ -119,7 +119,7 @@ void _mi_prim_thread_associate_default_heap(mi_heap_t* heap);
#define MI_WIN_USE_FIXED_TLS 1
//------------------------------------------------------------------- //-------------------------------------------------------------------
// Access to TLS (thread local storage) slots. // Access to TLS (thread local storage) slots.

28
src/prim/windows/prim.c
View file

@ -628,18 +628,16 @@ bool _mi_prim_random_buf(void* buf, size_t buf_len) {
//---------------------------------------------------------------- //----------------------------------------------------------------
#if MI_WIN_USE_FIXED_TLS==1 #if MI_WIN_USE_FIXED_TLS==1
mi_decl_cache_align size_t _mi_win_tls_offset = sizeof(void*); // use 2nd slot by default mi_decl_cache_align size_t _mi_win_tls_offset = 0;
#endif #endif
static void NTAPI mi_win_main(PVOID module, DWORD reason, LPVOID reserved) { static void mi_win_tls_init(DWORD reason) {
MI_UNUSED(reserved);
MI_UNUSED(module);
#if MI_HAS_TLS_SLOT >= 2 // we must initialize the TLS slot before any allocation #if MI_HAS_TLS_SLOT >= 2 // we must initialize the TLS slot before any allocation
#if MI_WIN_USE_FIXED_TLS==1 #if MI_WIN_USE_FIXED_TLS==1
if (reason==DLL_PROCESS_ATTACH) { if (reason==DLL_PROCESS_ATTACH && _mi_win_tls_offset == 0) {
const DWORD tls_slot = TlsAlloc(); const DWORD tls_slot = TlsAlloc(); // usually returns slot 1
if (tls_slot == TLS_OUT_OF_INDEXES) { if (tls_slot == TLS_OUT_OF_INDEXES) {
_mi_error_message(EFAULT, "unable to allocate the a TLS slot (rebuild without MI_WIN_USE_FIXED_TLS?)\n"); _mi_error_message(EFAULT, "unable to allocate the a TLS slot (rebuild without MI_WIN_USE_FIXED_TLS?)\n");
} }
_mi_win_tls_offset = (size_t)tls_slot * sizeof(void*); _mi_win_tls_offset = (size_t)tls_slot * sizeof(void*);
} }
@ -653,7 +651,15 @@ static void NTAPI mi_win_main(PVOID module, DWORD reason, LPVOID reserved) {
mi_assert_internal(p == (void*)&_mi_heap_empty); mi_assert_internal(p == (void*)&_mi_heap_empty);
#endif #endif
} }
#else
MI_UNUSED(reason);
#endif #endif
}
static void NTAPI mi_win_main(PVOID module, DWORD reason, LPVOID reserved) {
MI_UNUSED(reserved);
MI_UNUSED(module);
mi_win_tls_init(reason);
if (reason==DLL_PROCESS_ATTACH) { if (reason==DLL_PROCESS_ATTACH) {
_mi_process_load(); _mi_process_load();
} }
@ -815,11 +821,7 @@ static void NTAPI mi_win_main(PVOID module, DWORD reason, LPVOID reserved) {
#endif #endif
mi_decl_export void _mi_redirect_entry(DWORD reason) { mi_decl_export void _mi_redirect_entry(DWORD reason) {
// called on redirection; careful as this may be called before DllMain // called on redirection; careful as this may be called before DllMain
#if MI_HAS_TLS_SLOT >= 2 // we must initialize the TLS slot before any allocation mi_win_tls_init(reason);
if ((reason==DLL_PROCESS_ATTACH || reason==DLL_THREAD_ATTACH) && mi_prim_get_default_heap() == NULL) {
_mi_heap_set_default_direct((mi_heap_t*)&_mi_heap_empty);
}
#endif
if (reason == DLL_PROCESS_ATTACH) { if (reason == DLL_PROCESS_ATTACH) {
mi_redirected = true; mi_redirected = true;
} }