merge from dev

This commit is contained in:
Daan 2025-02-10 20:28:53 -08:00
commit a7a0db06d5
3 changed files with 8 additions and 6 deletions

View file

@ -166,10 +166,6 @@ mi_heap_t* mi_heap_get_backing(void) {
return bheap;
}
void mi_heap_set_in_threadpool(void) mi_attr_noexcept {
// nothing
}
// todo: make order of parameters consistent (but would that break compat with CPython?)
void _mi_heap_init(mi_heap_t* heap, mi_arena_id_t arena_id, bool allow_destroy, uint8_t heap_tag, mi_tld_t* tld)
{

View file

@ -602,6 +602,12 @@ void _mi_heap_set_default_direct(mi_heap_t* heap) {
_mi_prim_thread_associate_default_heap(heap);
}
void mi_thread_set_in_threadpool(void) mi_attr_noexcept {
mi_tld_t* tld = mi_tld();
if (tld!=NULL) {
tld->is_in_threadpool = true;
}
}
// --------------------------------------------------------
// Run functions on process init/done, and thread init/done