mirrors/mimalloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent reentrancy on thread_done (issue #699)

Browse Source
This commit is contained in:
Daan 2023-03-20 14:23:52 -07:00
parent b893311365
commit 06f0ba232e
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/init.c
View File

@ -380,15 +380,24 @@ void mi_thread_done(void) mi_attr_noexcept {
_mi_thread_done(NULL); _mi_thread_done(NULL);
} }
#include <unistd.h>
void _mi_thread_done(mi_heap_t* heap) void _mi_thread_done(mi_heap_t* heap)
{ {
mi_atomic_decrement_relaxed(&thread_count); // calling with NULL implies using the default heap
_mi_stat_decrease(&_mi_stats_main.threads, 1);
if (heap == NULL) { if (heap == NULL) {
heap = mi_prim_get_default_heap(); heap = mi_prim_get_default_heap();
if (heap == NULL) return; if (heap == NULL) return;
} }
// prevent re-entrancy through heap_done/heap_set_default_direct (issue #699)
if (!mi_heap_is_initialized(heap)) {
return;
}
// adjust stats
mi_atomic_decrement_relaxed(&thread_count);
_mi_stat_decrease(&_mi_stats_main.threads, 1);
// check thread-id as on Windows shutdown with FLS the main (exit) thread may call this on thread-local heaps... // check thread-id as on Windows shutdown with FLS the main (exit) thread may call this on thread-local heaps...
if (heap->thread_id != _mi_thread_id()) return; if (heap->thread_id != _mi_thread_id()) return;