Merge pull request mono/mono#3689 from alexrp/profiler-c9-fixes

Profiler fixes for Cycle 9 (mono/mono#2) Commit migrated from mono/mono@16e6b77
picenka21 · Oct 2, 2016 · 6370826 · 6370826
2 parents 9665650 + 6b0f810
commit 6370826
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/mono/mono/metadata/domain.c b/src/mono/mono/metadata/domain.c
@@ -1175,6 +1175,12 @@ 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/src/mono/mono/metadata/gc.c b/src/mono/mono/metadata/gc.c
@@ -560,8 +560,6 @@ mono_domain_finalize (MonoDomain *domain, guint32 timeout)
 		mono_gc_finalize_threadpool_threads ();
 	}
 
-	mono_profiler_appdomain_event (domain, MONO_PROFILE_END_UNLOAD);
-
 done:
 	if (InterlockedDecrement (&req->ref) == 0) {
 		mono_coop_sem_destroy (&req->done);

diff --git a/src/mono/mono/metadata/profiler.c b/src/mono/mono/metadata/profiler.c
@@ -968,7 +968,7 @@ mono_profiler_install_gc_finalize (MonoProfileGCFinalizeFunc begin, MonoProfileG
 
 	prof_list->gc_finalize_begin = begin;
 	prof_list->gc_finalize_object_begin = begin_obj;
-	prof_list->gc_finalize_object_begin = end_obj;
+	prof_list->gc_finalize_object_end = end_obj;
 	prof_list->gc_finalize_end = end;
 }