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

fix issue #208: dynamic unloading of DLL with statically linked mimalloc

Browse source
This commit is contained in:
daan 2020-03-06 16:24:51 -08:00
parent ab202fbe73
commit 5bc276c23b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/init.c
View file

@ -485,6 +485,10 @@ static void mi_process_done(void) {
if (process_done) return; if (process_done) return;
process_done = true; process_done = true;
#if defined(_WIN32) && !defined(MI_SHARED_LIB)
FlsSetValue(mi_fls_key, NULL); // don't call main-thread callback
FlsFree(mi_fls_key); // call thread-done on all threads to prevent dangling callback pointer if statically linked with a DLL; Issue #208
#endif
#ifndef NDEBUG #ifndef NDEBUG
mi_collect(true); mi_collect(true);
#endif #endif
@ -492,7 +496,7 @@ static void mi_process_done(void) {
mi_option_is_enabled(mi_option_verbose)) { mi_option_is_enabled(mi_option_verbose)) {
mi_stats_print(NULL); mi_stats_print(NULL);
} }
mi_allocator_done(); mi_allocator_done();
_mi_verbose_message("process done: 0x%zx\n", _mi_heap_main.thread_id); _mi_verbose_message("process done: 0x%zx\n", _mi_heap_main.thread_id);
os_preloading = true; // don't call the C runtime anymore os_preloading = true; // don't call the C runtime anymore
} }