fix theaps reference count error with pthreads

Author: daanx

include/mimalloc/internal.h

@@ -423,7 +423,7 @@ void __mi_stat_counter_increase_mt(mi_stat_counter_t* stat, size_t amount);
 #define MI_PTHREADS_GET_INVALID_KEY_IS_NULL  1
 #endif
 
-mi_decl_noinline bool _mi_pthread_key_create(pthread_key_t* pkey, void* init);
+mi_decl_noinline bool _mi_pthread_key_create(pthread_key_t* pkey, void (*destruct)(void*), void* init);
 
 static inline void* mi_pthread_key_get(pthread_key_t key) {
   #if !MI_PTHREADS_GET_INVALID_KEY_IS_NULL
@@ -434,7 +434,7 @@ static inline void* mi_pthread_key_get(pthread_key_t key) {
 
 static inline bool mi_pthread_key_set(pthread_key_t* pkey, void* val) {
   if mi_likely(*pkey!=MI_PTHREAD_KEY_INVALID) { pthread_setspecific(*pkey,val); return true; }
-  else if (val!=NULL) { return _mi_pthread_key_create(pkey,val); }
+  else if (val!=NULL) { return _mi_pthread_key_create(pkey,NULL,val); }
   else return true;
 }
 

src/arena.c

@@ -2444,7 +2444,7 @@ static bool mi_heap_delete_page(const mi_heap_t* heap, const mi_heap_area_t* are
 }
 
 static void mi_heap_delete_pages(mi_heap_t* heap, mi_heap_t* heap_target) {
-  mi_theap_t* const theap_target = (heap_target != NULL ? _mi_heap_theap(heap_target) : NULL);
+  mi_theap_t* const theap_target = (heap_target != NULL ? _mi_heap_theap_peek(heap_target) : NULL);
   // mi_theap_t* const theap = _mi_heap_theap(heap);
   mi_heap_delete_visit_info_t info = { heap_target, theap_target, NULL };
   _mi_heap_visit_blocks(heap, false, false, &mi_heap_delete_page, &info);

src/init.c

@@ -916,10 +916,17 @@ static void mi_win_tls_slot_set(size_t slot, size_t extended_slot, void* value)
 mi_decl_hidden pthread_key_t _mi_theap_default_key = MI_PTHREAD_KEY_INVALID;
 mi_decl_hidden pthread_key_t _mi_theap_cached_key = MI_PTHREAD_KEY_INVALID;
 
+static void mi_theap_cached_key_destroy(void* theapv) {
+  mi_theap_t* theap = (mi_theap_t*)theapv;
+  if (theap!=NULL) {
+    _mi_theap_decref(theap);
+  }
+}
+
 static void mi_tls_slots_init(void) {
   mi_atomic_do_once {
-    _mi_pthread_key_create(&_mi_theap_default_key,NULL);
-    _mi_pthread_key_create(&_mi_theap_cached_key,NULL);
+    _mi_pthread_key_create(&_mi_theap_default_key,NULL,NULL);
+    _mi_pthread_key_create(&_mi_theap_cached_key,&mi_theap_cached_key_destroy,NULL);
   }
 }
 
@@ -1013,6 +1020,7 @@ void _mi_auto_process_init(void) {
   mi_assert_internal(_mi_is_main_thread());
 
   mi_process_init();
+  mi_tls_slots_init();
   mi_process_setup_auto_thread_done();
   _mi_thread_locals_init();
 

src/libc.c

@@ -140,8 +140,8 @@ void _mi_atomic_once_release(mi_atomic_once_t* once) {
 }
 
 #if MI_USE_PTHREADS
-mi_decl_noinline bool _mi_pthread_key_create(pthread_key_t* pkey, void* init) {
-  int err = pthread_key_create(pkey,NULL);
+mi_decl_noinline bool _mi_pthread_key_create(pthread_key_t* pkey, void (*destruct)(void*), void* init) {
+  int err = pthread_key_create(pkey,destruct);
   if mi_unlikely(err!=0) {
     *pkey = MI_PTHREAD_KEY_INVALID;
     _mi_error_message(ENOMEM,"unable to allocate a thread local variable (error %d)\n", err);