projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mini] Shut down the profiler after shutting down the major runtime components.
[mono.git]
/
mono
/
mini
/
mini-runtime.c
diff --git
a/mono/mini/mini-runtime.c
b/mono/mini/mini-runtime.c
index 06238b4d68898a161a0b196d77a2fb05774f94f4..795bab9e41d319ebb23ec690c14ee6cf6c288980 100644
(file)
--- a/
mono/mini/mini-runtime.c
+++ b/
mono/mini/mini-runtime.c
@@
-3065,13
+3065,13
@@
mono_jit_create_remoting_trampoline (MonoDomain *domain, MonoMethod *method, Mon
}
#endif
}
#endif
-static void
+static
G_GNUC_UNUSED
void
no_imt_trampoline (void)
{
g_assert_not_reached ();
}
no_imt_trampoline (void)
{
g_assert_not_reached ();
}
-static void
+static
G_GNUC_UNUSED
void
no_vcall_trampoline (void)
{
g_assert_not_reached ();
no_vcall_trampoline (void)
{
g_assert_not_reached ();
@@
-4164,7
+4164,8
@@
print_jit_stats (void)
void
mini_cleanup (MonoDomain *domain)
{
void
mini_cleanup (MonoDomain *domain)
{
- mono_runtime_shutdown_stat_profiler ();
+ if (mono_profiler_get_events () & MONO_PROFILE_STATISTICAL)
+ mono_runtime_shutdown_stat_profiler ();
#ifndef DISABLE_COM
cominterop_release_all_rcws ();
#ifndef DISABLE_COM
cominterop_release_all_rcws ();
@@
-4181,12
+4182,12
@@
mini_cleanup (MonoDomain *domain)
/* This accesses metadata so needs to be called before runtime shutdown */
print_jit_stats ();
/* This accesses metadata so needs to be called before runtime shutdown */
print_jit_stats ();
- mono_profiler_shutdown ();
-
#ifndef MONO_CROSS_COMPILE
mono_runtime_cleanup (domain);
#endif
#ifndef MONO_CROSS_COMPILE
mono_runtime_cleanup (domain);
#endif
+ mono_profiler_shutdown ();
+
free_jit_tls_data ((MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id));
mono_icall_cleanup ();
free_jit_tls_data ((MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id));
mono_icall_cleanup ();