[domain] Report domain unloads to the profiler when finalizing the domain.

We would miss the unload event for the root domain because we reported it just
before freeing the domain, by which time the profiler was detached.

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index 0d0c20b7c6288e4102e2629d558ca1b81228863f..fa2514b9814b088d8748494a51fda80edc8c2df3 100644 (file)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -1169,12 +1169,6 @@ mono_domain_free (MonoDomain *domain, gboolean force)
        g_slist_free (domain->domain_assemblies);
        domain->domain_assemblies = NULL;
 
-       /* 
-        * Send this after the assemblies have been unloaded and the domain is still in a 
-        * usable state.
-        */
-       mono_profiler_appdomain_event (domain, MONO_PROFILE_END_UNLOAD);
-
        if (free_domain_hook)
                free_domain_hook (domain);
 

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index bf02f2892b2e8ff3f8c0f544e2c3a08cf4dfa2b5..3871ee4b0c102ae1081e37bc15e33682915cf21a 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -453,6 +453,8 @@ mono_domain_finalize (MonoDomain *domain, guint32 timeout)
                mono_gc_finalize_threadpool_threads ();
        }
 
+       mono_profiler_appdomain_event (domain, MONO_PROFILE_END_UNLOAD);
+
        return TRUE;
 }