[threads] Fix leaking threads: SGen Worker and Finalizer (#5284)

[mono.git] / mono / metadata / gc.c

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index 4b1a56f4c0feeba858aca442d9e0ab057d7b1130..28b4747b27ee08f368cd2348b0eae02f0a4676eb 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -973,6 +973,11 @@ mono_gc_cleanup (void)
                return;
 
        if (!gc_disabled) {
+
+               /* Stop all worker threads before signalling the finalizer to stop
+                * That way the finalizer has a chance to clean up the worker threads */
+               mono_gc_base_cleanup ();
+
                finished = TRUE;
                if (mono_thread_internal_current () != gc_thread) {
                        int ret;
@@ -995,7 +1000,8 @@ mono_gc_cleanup (void)
                                        ret = guarded_wait (gc_thread->handle, MONO_INFINITE_WAIT, FALSE);
                                        g_assert (ret == MONO_THREAD_INFO_WAIT_RET_SUCCESS_0);
 
-                                       mono_thread_join (GUINT_TO_POINTER (gc_thread->tid));
+                                       /* Clean up the finalizer (and other threads that might still wait to be joined) */
+                                       mono_threads_join_threads ();
                                        break;
                                }
 
@@ -1020,7 +1026,8 @@ mono_gc_cleanup (void)
 
                                        g_assert (ret == MONO_THREAD_INFO_WAIT_RET_SUCCESS_0);
 
-                                       mono_thread_join (GUINT_TO_POINTER (gc_thread->tid));
+                                       /* Clean up the finalizer (and other threads that might still wait to be joined) */
+                                       mono_threads_join_threads ();
                                        break;
                                }
 
@@ -1031,7 +1038,6 @@ mono_gc_cleanup (void)
                        }
                }
                gc_thread = NULL;
-               mono_gc_base_cleanup ();
        }
 
        mono_reference_queue_cleanup ();