From ab893a369a3b24ee637db711e1d7ffe96ebe7f4a Mon Sep 17 00:00:00 2001 From: Mitchell Hwang Date: Mon, 16 Mar 2020 08:27:24 -0400 Subject: [PATCH] [Loader] Change mono_trace level from info to debug (#19110) * [metadata] Change mono_trace levels from info to debug * [mini] Change mono_trace level from info to debug * [sgen] Change mono_trace levels from info to debug * Amended metadata changes * Amended mini changes * Amend assembly.c no special case * Amend sgen-mono.c elevate to warning level Co-authored-by: Mitchell Hwang --- mono/metadata/appdomain.c | 4 +-- mono/metadata/assembly-load-context.c | 6 ++-- mono/metadata/assembly.c | 54 +++++++++++++++---------------- mono/metadata/domain.c | 4 +-- mono/metadata/image.c | 10 +++--- mono/metadata/mono-config.c | 2 +- mono/metadata/native-library.c | 34 +++++++++---------- mono/metadata/sgen-bridge.c | 4 +-- mono/metadata/sgen-mono.c | 4 +-- mono/metadata/sgen-new-bridge.c | 6 ++-- mono/metadata/sgen-old-bridge.c | 6 ++-- mono/metadata/sgen-tarjan-bridge.c | 2 +- mono/metadata/threadpool-worker-default.c | 4 +-- mono/mini/aot-runtime.c | 22 ++++++------- mono/mini/monovm.c | 2 +- mono/sgen/sgen-memory-governor.c | 10 +++--- 16 files changed, 87 insertions(+), 87 deletions(-) diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c index 65354fd9698..55ff92e847d 100644 --- a/mono/metadata/appdomain.c +++ b/mono/metadata/appdomain.c @@ -1543,7 +1543,7 @@ add_assemblies_to_domain (MonoDomain *domain, MonoAssembly *ass, GHashTable *ht) mono_assembly_addref (ass); g_hash_table_add (ht, ass); domain->domain_assemblies = g_slist_append (domain->domain_assemblies, ass); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly %s[%p] added to domain %s, ref_count=%d", ass->aname.name, ass, domain->friendly_name, ass->ref_count); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly %s[%p] added to domain %s, ref_count=%d", ass->aname.name, ass, domain->friendly_name, ass->ref_count); } #ifndef ENABLE_NETCORE @@ -1585,7 +1585,7 @@ add_assembly_to_alc (MonoAssemblyLoadContext *alc, MonoAssembly *ass) mono_assembly_addref (ass); // Prepending here will break the test suite with frequent InvalidCastExceptions, so we have to append alc->loaded_assemblies = g_slist_append (alc->loaded_assemblies, ass); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly %s[%p] added to ALC (%p), ref_count=%d", ass->aname.name, ass, (gpointer)alc, ass->ref_count); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly %s[%p] added to ALC (%p), ref_count=%d", ass->aname.name, ass, (gpointer)alc, ass->ref_count); } #endif diff --git a/mono/metadata/assembly-load-context.c b/mono/metadata/assembly-load-context.c index 133ebb83382..df7fe4fbd01 100644 --- a/mono/metadata/assembly-load-context.c +++ b/mono/metadata/assembly-load-context.c @@ -175,7 +175,7 @@ mono_alc_invoke_resolve_using_load_nofail (MonoAssemblyLoadContext *alc, MonoAss result = mono_alc_invoke_resolve_using_load (alc, aname, error); if (!is_ok (error)) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Error while invoking ALC Load(\"%s\") method: '%s'", aname->name, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Error while invoking ALC Load(\"%s\") method: '%s'", aname->name, mono_error_get_message (error)); mono_error_cleanup (error); @@ -208,7 +208,7 @@ mono_alc_invoke_resolve_using_resolving_event_nofail (MonoAssemblyLoadContext *a result = mono_alc_invoke_resolve_using_resolving_event (alc, aname, error); if (!is_ok (error)) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Error while invoking ALC Resolving(\"%s\") event: '%s'", aname->name, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Error while invoking ALC Resolving(\"%s\") event: '%s'", aname->name, mono_error_get_message (error)); mono_error_cleanup (error); @@ -241,7 +241,7 @@ mono_alc_invoke_resolve_using_resolve_satellite_nofail (MonoAssemblyLoadContext result = mono_alc_invoke_resolve_using_resolve_satellite (alc, aname, error); if (!is_ok (error)) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Error while invoking ALC ResolveSatelliteAssembly(\"%s\") method: '%s'", aname->name, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Error while invoking ALC ResolveSatelliteAssembly(\"%s\") method: '%s'", aname->name, mono_error_get_message (error)); mono_error_cleanup (error); diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c index 9960747ab48..1ef1eaa38cf 100644 --- a/mono/metadata/assembly.c +++ b/mono/metadata/assembly.c @@ -1375,7 +1375,7 @@ remap_keys (MonoAssemblyName *aname) memcpy (aname->public_key_token, entry->to, MONO_PUBLIC_KEY_TOKEN_LENGTH); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Remapped public key token of retargetable assembly %s from %s to %s", aname->name, entry->from, entry->to); return; @@ -1410,7 +1410,7 @@ mono_assembly_remap_version (MonoAssemblyName *aname, MonoAssemblyName *dest_ana remap_keys (dest_aname); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "The request to load the retargetable assembly %s v%d.%d.%d.%d was remapped to %s v%d.%d.%d.%d", aname->name, aname->major, aname->minor, aname->build, aname->revision, @@ -1805,7 +1805,7 @@ mono_assembly_load_reference (MonoImage *image, int index) if (reference) return; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Requesting loading reference %d (of %d) of %s", index, image->nreferences, image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Requesting loading reference %d (of %d) of %s", index, image->nreferences, image->name); ERROR_DECL (local_error); mono_assembly_get_assemblyref_checked (image, index, &aname, local_error); @@ -1818,7 +1818,7 @@ mono_assembly_load_reference (MonoImage *image, int index) if (image->assembly) { if (mono_trace_is_traced (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY)) { char *aname_str = mono_stringify_assembly_name (&aname); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Loading reference %d of %s asmctx %s, looking for %s", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Loading reference %d of %s asmctx %s, looking for %s", index, image->name, mono_asmctx_get_name (&image->assembly->context), aname_str); g_free (aname_str); @@ -1894,7 +1894,7 @@ commit_reference: if (reference != REFERENCE_MISSING){ mono_assembly_addref (reference); if (image->assembly) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly Ref addref %s[%p] -> %s[%p]: %d", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly Ref addref %s[%p] -> %s[%p]: %d", image->assembly->aname.name, image->assembly, reference->aname.name, reference, reference->ref_count); } else { if (image->assembly) @@ -2440,7 +2440,7 @@ mono_assembly_open_from_bundle (MonoAssemblyLoadContext *alc, const char *filena } if (image) { mono_image_addref (image); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly Loader loaded assembly from bundle: '%s'.", is_satellite ? filename : name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly Loader loaded assembly from bundle: '%s'.", is_satellite ? filename : name); g_free (name); return image; } @@ -2549,7 +2549,7 @@ mono_assembly_request_open (const char *filename, const MonoAssemblyOpenRequest fname = g_strdup (filename); } - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly Loader probing location: '%s'.", fname); new_fname = NULL; @@ -2583,7 +2583,7 @@ mono_assembly_request_open (const char *filename, const MonoAssemblyOpenRequest if (new_fname && new_fname != fname) { g_free (fname); fname = new_fname; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly Loader shadow-copied assembly to: '%s'.", fname); } @@ -2655,7 +2655,7 @@ mono_assembly_request_open (const char *filename, const MonoAssemblyOpenRequest if (ass) { if (!loaded_from_bundle) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly Loader loaded assembly from location: '%s'.", filename); if (!refonly) mono_config_for_assembly_internal (ass->image); @@ -2884,10 +2884,10 @@ mono_assembly_binding_applies_to_image (MonoAssemblyLoadContext *alc, MonoImage* MonoAssemblyName *result_name = &probed_aname; result_name = mono_assembly_apply_binding (result_name, &dest_name); if (result_name != &probed_aname && !mono_assembly_names_equal (result_name, &probed_aname)) { - if (mono_trace_is_traced (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY)) { + if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY)) { char *probed_fullname = mono_stringify_assembly_name (&probed_aname); char *result_fullname = mono_stringify_assembly_name (result_name); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Request to load from %s in (%s) remapped to %s", probed_fullname, image->name, result_fullname); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Request to load from %s in (%s) remapped to %s", probed_fullname, image->name, result_fullname); g_free (probed_fullname); g_free (result_fullname); } @@ -2944,9 +2944,9 @@ mono_problematic_image_reprobe (MonoAssemblyLoadContext *alc, MonoImage *image, *status = MONO_IMAGE_IMAGE_INVALID; return NULL; } - if (mono_trace_is_traced (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY)) { + if (mono_trace_is_traced (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY)) { char *probed_fullname = mono_stringify_assembly_name (&probed_aname); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Requested to load from problematic image %s, probing instead for assembly with name %s", image->name, probed_fullname); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Requested to load from problematic image %s, probing instead for assembly with name %s", image->name, probed_fullname); g_free (probed_fullname); } const char *new_basedir = NULL; @@ -3105,7 +3105,7 @@ mono_assembly_request_load_from (MonoImage *image, const char *fname, /* Add a non-temporary reference because of ass->image */ mono_image_addref (image); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Image addref %s[%p] (asmctx %s) -> %s[%p]: %d", ass->aname.name, ass, mono_asmctx_get_name (&ass->context), image->name, image, image->ref_count); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Image addref %s[%p] (asmctx %s) -> %s[%p]: %d", ass->aname.name, ass, mono_asmctx_get_name (&ass->context), image->name, image, image->ref_count); /* * The load hooks might take locks so we can't call them while holding the @@ -3134,7 +3134,7 @@ mono_assembly_request_load_from (MonoImage *image, const char *fname, if (asmctx != MONO_ASMCTX_REFONLY) { ERROR_DECL (refasm_error); if (mono_assembly_has_reference_assembly_attribute (ass, refasm_error)) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Image for assembly '%s' (%s) has ReferenceAssemblyAttribute, skipping", ass->aname.name, image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Image for assembly '%s' (%s) has ReferenceAssemblyAttribute, skipping", ass->aname.name, image->name); g_free (ass); g_free (base_dir); mono_image_close (image); @@ -3145,7 +3145,7 @@ mono_assembly_request_load_from (MonoImage *image, const char *fname, } if (predicate && !predicate (ass, user_data)) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate returned FALSE, skipping '%s' (%s)\n", ass->aname.name, image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate returned FALSE, skipping '%s' (%s)\n", ass->aname.name, image->name); g_free (ass); g_free (base_dir); mono_image_close (image); @@ -3173,7 +3173,7 @@ mono_assembly_request_load_from (MonoImage *image, const char *fname, return ass2; } - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Prepared to set up assembly '%s' (%s)", ass->aname.name, image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Prepared to set up assembly '%s' (%s)", ass->aname.name, image->name); /* If asmctx is INDIVIDUAL, image->assembly might not be NULL, so don't * overwrite it. */ @@ -4182,7 +4182,7 @@ assembly_binding_info_parsed (MonoAssemblyBindingInfo *info, void *user_data) return; if (info->has_new_version && mono_assembly_is_problematic_version (info->name, info->new_version.major, info->new_version.minor, info->new_version.build, info->new_version.revision)) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Discarding assembly binding to problematic version %s v%d.%d.%d.%d", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Discarding assembly binding to problematic version %s v%d.%d.%d.%d", info->name, info->new_version.major, info->new_version.minor, info->new_version.build, info->new_version.revision); return; } @@ -4564,10 +4564,10 @@ mono_assembly_candidate_predicate_sn_same_name (MonoAssembly *candidate, gpointe if (mono_trace_is_traced (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY)) { char * s = mono_stringify_assembly_name (wanted_name); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: wanted = %s", s); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: wanted = %s", s); g_free (s); s = mono_stringify_assembly_name (candidate_name); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: candidate = %s", s); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: candidate = %s", s); g_free (s); } @@ -4576,13 +4576,13 @@ mono_assembly_candidate_predicate_sn_same_name (MonoAssembly *candidate, gpointe #else /* Wanted name has no token, not strongly named: always matches. */ if (0 == wanted_name->public_key_token [0]) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: wanted has no token, returning TRUE"); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: wanted has no token, returning TRUE"); return TRUE; } /* Candidate name has no token, not strongly named: never matches */ if (0 == candidate_name->public_key_token [0]) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: candidate has no token, returning FALSE"); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: candidate has no token, returning FALSE"); return FALSE; } @@ -4602,7 +4602,7 @@ mono_assembly_check_name_match (MonoAssemblyName *wanted_name, MonoAssemblyName gboolean result = mono_assembly_names_equal_flags (wanted_name, candidate_name, MONO_ANAME_EQ_NONE); #endif - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: candidate and wanted names %s", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: candidate and wanted names %s", result ? "match, returning TRUE" : "don't match, returning FALSE"); return result; @@ -4619,18 +4619,18 @@ framework_assembly_sn_match (MonoAssemblyName *wanted_name, MonoAssemblyName *ca if (!vmap->framework_facade_assembly) { /* If the wanted name is a framework assembly, it's enough for the name/version/culture to match. If the assembly was remapped, the public key token is likely unrelated. */ gboolean result = mono_assembly_names_equal_flags (wanted_name, candidate_name, MONO_ANAME_EQ_IGNORE_PUBKEY); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: candidate and wanted names %s (ignoring the public key token)", result ? "match, returning TRUE" : "don't match, returning FALSE"); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: candidate and wanted names %s (ignoring the public key token)", result ? "match, returning TRUE" : "don't match, returning FALSE"); return result; } else { /* For facades, the name and public key token should * match, but the version doesn't matter as long as the * candidate is not older. */ gboolean result = mono_assembly_names_equal_flags (wanted_name, candidate_name, MONO_ANAME_EQ_IGNORE_VERSION); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: candidate and wanted names %s (ignoring version)", result ? "match" : "don't match, returning FALSE"); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: candidate and wanted names %s (ignoring version)", result ? "match" : "don't match, returning FALSE"); if (result) { // compare major of candidate and wanted int c = assembly_names_compare_versions (candidate_name, wanted_name, 1); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Predicate: candidate major version is %s wanted major version, returning %s\n", c == 0 ? "the same as" : (c < 0 ? "lower than" : "greater than"), + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Predicate: candidate major version is %s wanted major version, returning %s\n", c == 0 ? "the same as" : (c < 0 ? "lower than" : "greater than"), (c >= 0) ? "TRUE" : "FALSE"); return (c >= 0); // don't accept a candidate that's older than wanted. } else { @@ -4937,7 +4937,7 @@ mono_assembly_close_except_image_pools (MonoAssembly *assembly) MONO_PROFILER_RAISE (assembly_unloading, (assembly)); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading assembly %s [%p].", assembly->aname.name, assembly); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Unloading assembly %s [%p].", assembly->aname.name, assembly); mono_debug_close_image (assembly->image); diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c index 8dee607c7ea..5940f6cb2d1 100644 --- a/mono/metadata/domain.c +++ b/mono/metadata/domain.c @@ -1189,7 +1189,7 @@ mono_domain_free (MonoDomain *domain, gboolean force) MonoAssembly *ass = (MonoAssembly *)tmp->data; if (!ass->image || !image_is_dynamic (ass->image)) continue; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading domain %s[%p], assembly %s[%p], ref_count=%d", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Unloading domain %s[%p], assembly %s[%p], ref_count=%d", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count); if (!mono_assembly_close_except_image_pools (ass)) tmp->data = NULL; } @@ -1200,7 +1200,7 @@ mono_domain_free (MonoDomain *domain, gboolean force) continue; if (!ass->image || image_is_dynamic (ass->image)) continue; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading domain %s[%p], assembly %s[%p], ref_count=%d", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Unloading domain %s[%p], assembly %s[%p], ref_count=%d", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count); if (!mono_assembly_close_except_image_pools (ass)) tmp->data = NULL; } diff --git a/mono/metadata/image.c b/mono/metadata/image.c index b2e52e64e18..c7b309d60b8 100644 --- a/mono/metadata/image.c +++ b/mono/metadata/image.c @@ -520,7 +520,7 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo) image->heap_tables.size = read32 (ptr + 4); ptr += 8 + 3; image->uncompressed_metadata = TRUE; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly '%s' has the non-standard metadata heap #-.\nRecompile it correctly (without the /incremental switch or in Release mode).", image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Assembly '%s' has the non-standard metadata heap #-.\nRecompile it correctly (without the /incremental switch or in Release mode).", image->name); } else if (strncmp (ptr + 8, "#Pdb", 5) == 0) { image->heap_pdb.data = image->raw_metadata + read32 (ptr); image->heap_pdb.size = read32 (ptr + 4); @@ -1382,9 +1382,9 @@ do_mono_image_load (MonoImage *image, MonoImageOpenStatus *status, if (!image->ref_only && mono_is_problematic_image (image)) { if (image->load_from_context) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Loading problematic image %s", image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Loading problematic image %s", image->name); } else { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Denying load of problematic image %s", image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Denying load of problematic image %s", image->name); if (status) *status = MONO_IMAGE_IMAGE_INVALID; goto invalid_image; @@ -1411,7 +1411,7 @@ done: invalid_image: if (!is_ok (error)) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Could not load image %s due to %s", image->name, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Could not load image %s due to %s", image->name, mono_error_get_message (error)); mono_error_cleanup (error); } MONO_PROFILER_RAISE (image_failed, (image)); @@ -2351,7 +2351,7 @@ mono_image_close_except_pools (MonoImage *image) MONO_PROFILER_RAISE (image_unloading, (image)); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading image %s [%p].", image->name, image); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Unloading image %s [%p].", image->name, image); mono_image_invoke_unload_hook (image); diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c index 37787ac10b6..f0940187e1f 100644 --- a/mono/metadata/mono-config.c +++ b/mono/metadata/mono-config.c @@ -564,7 +564,7 @@ mono_config_parse_file_with_context (MonoConfigParseState *state, const char *fi gsize len; gint offset; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_CONFIG, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_CONFIG, "Config attempting to parse: '%s'.", filename); if (!g_file_get_contents (filename, &text, &len, NULL)) diff --git a/mono/metadata/native-library.c b/mono/metadata/native-library.c index 3cd38087724..6e109612810 100644 --- a/mono/metadata/native-library.c +++ b/mono/metadata/native-library.c @@ -508,7 +508,7 @@ netcore_probe_for_module_variations (const char *mdirname, const char *file_name char *error_msg; module = mono_dl_open (full_name, MONO_DL_LAZY, &error_msg); if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", full_name, error_msg); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", full_name, error_msg); g_free (error_msg); } g_free (full_name); @@ -596,7 +596,7 @@ netcore_resolve_with_dll_import_resolver_nofail (MonoAssemblyLoadContext *alc, M result = netcore_resolve_with_dll_import_resolver (alc, assembly, scope, flags, error); if (!is_ok (error)) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Error while invoking ALC DllImportResolver(\"%s\") delegate: '%s'", scope, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Error while invoking ALC DllImportResolver(\"%s\") delegate: '%s'", scope, mono_error_get_message (error)); mono_error_cleanup (error); @@ -652,7 +652,7 @@ netcore_resolve_with_load_nofail (MonoAssemblyLoadContext *alc, const char *scop result = netcore_resolve_with_load (alc, scope, error); if (!is_ok (error)) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Error while invoking ALC LoadUnmanagedDll(\"%s\") method: '%s'", scope, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Error while invoking ALC LoadUnmanagedDll(\"%s\") method: '%s'", scope, mono_error_get_message (error)); mono_error_cleanup (error); @@ -712,7 +712,7 @@ netcore_resolve_with_resolving_event_nofail (MonoAssemblyLoadContext *alc, MonoA result = netcore_resolve_with_resolving_event (alc, assembly, scope, error); if (!is_ok (error)) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Error while invoking ALC ResolvingUnmangedDll(\"%s\") event: '%s'", scope, mono_error_get_message (error)); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "Error while invoking ALC ResolvingUnmangedDll(\"%s\") event: '%s'", scope, mono_error_get_message (error)); mono_error_cleanup (error); @@ -753,7 +753,7 @@ netcore_lookup_native_library (MonoAssemblyLoadContext *alc, MonoImage *image, c MONO_REQ_GC_UNSAFE_MODE; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, "DllImport attempting to load: '%s'.", scope); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport attempting to load: '%s'.", scope); // We allow a special name to dlopen from the running process namespace, which is not present in CoreCLR if (strcmp (scope, "__Internal") == 0) { @@ -963,7 +963,7 @@ legacy_probe_for_module_in_directory (const char *mdirname, const char *file_nam char *error_msg; module = cached_module_load (full_name, MONO_DL_LAZY, &error_msg); if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", full_name, error_msg); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", full_name, error_msg); g_free (error_msg); } g_free (full_name); @@ -1063,7 +1063,7 @@ legacy_probe_for_module (MonoImage *image, const char *new_scope) int i; MonoDl *module = NULL; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, "DllImport attempting to load: '%s'.", new_scope); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport attempting to load: '%s'.", new_scope); /* we allow a special name to dlopen from the running process namespace */ if (strcmp (new_scope, "__Internal") == 0) { @@ -1093,7 +1093,7 @@ legacy_probe_for_module (MonoImage *image, const char *new_scope) if (!module && is_absolute) { module = cached_module_load (file_name, MONO_DL_LAZY, &error_msg); if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", file_name, error_msg); g_free (error_msg); @@ -1110,7 +1110,7 @@ legacy_probe_for_module (MonoImage *image, const char *new_scope) while ((full_name = mono_dl_build_path (dir_name, file_or_base, &iter))) { module = cached_module_load (full_name, MONO_DL_LAZY, &error_msg); if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", full_name, error_msg); g_free (error_msg); @@ -1124,7 +1124,7 @@ legacy_probe_for_module (MonoImage *image, const char *new_scope) if (!module) { module = cached_module_load (file_name, MONO_DL_LAZY, &error_msg); if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", file_name, error_msg); g_free (error_msg); @@ -1162,7 +1162,7 @@ legacy_lookup_native_library (MonoImage *image, const char *scope) module = legacy_probe_for_module (image, scope); if (module && !cached) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport loaded library '%s'.", module->full_name); mono_image_lock (image); if (!g_hash_table_lookup (image->pinvoke_scopes, scope)) { @@ -1256,7 +1256,7 @@ lookup_pinvoke_call_impl (MonoMethod *method, MonoLookupPInvokeStatus *status_ou goto exit; } - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport searching in: '%s' ('%s').", new_scope, module->full_name); addr = pinvoke_probe_for_symbol (module, piinfo, new_import, &error_msg); @@ -1293,7 +1293,7 @@ pinvoke_probe_for_symbol (MonoDl *module, MonoMethodPInvoke *piinfo, const char import++; } #endif - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "Searching for '%s'.", import); if (piinfo->piflags & PINVOKE_ATTRIBUTE_NO_MANGLE) @@ -1359,16 +1359,16 @@ pinvoke_probe_for_symbol (MonoDl *module, MonoMethodPInvoke *piinfo, const char mangled_name = mangled_stdcall_name; } #endif - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "Probing '%s'.", mangled_name); error_msg = mono_dl_symbol (module, mangled_name, &addr); if (addr) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "Found as '%s'.", mangled_name); else - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "Could not find '%s' due to '%s'.", mangled_name, error_msg); g_free (error_msg); @@ -1518,7 +1518,7 @@ ves_icall_System_Runtime_InteropServices_NativeLibrary_LoadFromPath (MonoStringH module = mono_dl_open (lib_path, MONO_DL_LAZY, &error_msg); if (!module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", lib_path, error_msg); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_DLLIMPORT, "DllImport error loading library '%s': '%s'.", lib_path, error_msg); mono_error_set_generic_error (error, "System", "DllNotFoundException", "'%s': '%s'", lib_path, error_msg); g_free (error_msg); } diff --git a/mono/metadata/sgen-bridge.c b/mono/metadata/sgen-bridge.c index 2b4c662c5ca..18aa1c2c5a3 100644 --- a/mono/metadata/sgen-bridge.c +++ b/mono/metadata/sgen-bridge.c @@ -58,7 +58,7 @@ mono_gc_wait_for_bridge_processing (void) if (!mono_bridge_processing_in_progress) return; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_BRIDGE waiting for bridge processing to finish"); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_BRIDGE waiting for bridge processing to finish"); sgen_gc_lock (); sgen_gc_unlock (); @@ -476,7 +476,7 @@ sgen_bridge_processing_finish (int generation) if (compare_bridge_processors ()) compare_to_bridge_processor.processing_after_callback (generation); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_BRIDGE: Complete, was running for %.2fms", mono_time_since_last_stw () / 10000.0f); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_BRIDGE: Complete, was running for %.2fms", mono_time_since_last_stw () / 10000.0f); mono_bridge_processing_in_progress = FALSE; } diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c index 6661f40d6c6..ab104aafe79 100644 --- a/mono/metadata/sgen-mono.c +++ b/mono/metadata/sgen-mono.c @@ -2893,9 +2893,9 @@ sgen_client_degraded_allocation (void) if (mono_atomic_load_i32 (&last_major_gc_warned) < major_gc_count) { gint32 num = mono_atomic_inc_i32 (&num_degraded); if (num == 1 || num == 3) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "Warning: Degraded allocation. Consider increasing nursery-size if the warning persists."); + mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_GC, "Warning: Degraded allocation. Consider increasing nursery-size if the warning persists."); else if (num == 10) - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "Warning: Repeated degraded allocation. Consider increasing nursery-size."); + mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_GC, "Warning: Repeated degraded allocation. Consider increasing nursery-size."); mono_atomic_store_i32 (&last_major_gc_warned, major_gc_count); } diff --git a/mono/metadata/sgen-new-bridge.c b/mono/metadata/sgen-new-bridge.c index e9af8be8ab8..e8a780d3eaf 100644 --- a/mono/metadata/sgen-new-bridge.c +++ b/mono/metadata/sgen-new-bridge.c @@ -906,7 +906,7 @@ processing_build_callback_data (int generation) if (entry->entry.is_bridge) { MonoObject *obj = sgen_hash_table_key_for_value_pointer (entry); MonoClass *klass = SGEN_LOAD_VTABLE (obj)->klass; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "OBJECT %s::%s (%p) weight %f", m_class_get_name_space (klass), m_class_get_name (klass), obj, entry->weight); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "OBJECT %s::%s (%p) weight %f", m_class_get_name_space (klass), m_class_get_name (klass), obj, entry->weight); } } } @@ -1030,7 +1030,7 @@ processing_after_callback (int generation) for (i = 0; i < num_sccs; ++i) { for (j = 0; j < api_sccs [i]->num_objs; ++j) { GCVTable vtable = SGEN_LOAD_VTABLE (api_sccs [i]->objs [j]); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "OBJECT %s.%s (%p) SCC [%d] %s", sgen_client_vtable_get_namespace (vtable), sgen_client_vtable_get_name (vtable), api_sccs [i]->objs [j], i, @@ -1039,7 +1039,7 @@ processing_after_callback (int generation) } } - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_NEW_BRIDGE num-objects %d num_hash_entries %d sccs size %d init %.2fms df1 %.2fms sort %.2fms dfs2 %.2fms setup-cb %.2fms free-data %.2fms links %d/%d/%d/%d dfs passes %d/%d ignored %d", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_NEW_BRIDGE num-objects %d num_hash_entries %d sccs size %d init %.2fms df1 %.2fms sort %.2fms dfs2 %.2fms setup-cb %.2fms free-data %.2fms links %d/%d/%d/%d dfs passes %d/%d ignored %d", num_registered_bridges, hash_table_size, dyn_array_scc_size (&sccs), step_1 / 10000.0f, step_2 / 10000.0f, diff --git a/mono/metadata/sgen-old-bridge.c b/mono/metadata/sgen-old-bridge.c index 31112ba982d..b9ef527dd42 100644 --- a/mono/metadata/sgen-old-bridge.c +++ b/mono/metadata/sgen-old-bridge.c @@ -749,7 +749,7 @@ processing_build_callback_data (int generation) HashEntryWithAccounting *entry = (HashEntryWithAccounting*)all_entries [i]; if (entry->entry.is_bridge) { MonoClass *klass = SGEN_LOAD_VTABLE (entry->entry.obj)->klass; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "OBJECT %s::%s (%p) weight %f", m_class_get_name_space (klass), m_class_get_name (klass), entry->entry.obj, entry->weight); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "OBJECT %s::%s (%p) weight %f", m_class_get_name_space (klass), m_class_get_name (klass), entry->entry.obj, entry->weight); } } } @@ -868,7 +868,7 @@ processing_after_callback (int generation) for (i = 0; i < num_sccs; ++i) { for (j = 0; j < api_sccs [i]->num_objs; ++j) { GCVTable vtable = SGEN_LOAD_VTABLE (api_sccs [i]->objs [j]); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "OBJECT %s.%s (%p) SCC [%d] %s", sgen_client_vtable_get_namespace (vtable), sgen_client_vtable_get_name (vtable), api_sccs [i]->objs [j], i, @@ -877,7 +877,7 @@ processing_after_callback (int generation) } } - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_OLD_BRIDGE num-objects %d num_hash_entries %d sccs size %d init %.2fms df1 %.2fms sort %.2fms dfs2 %.2fms setup-cb %.2fms free-data %.2fms links %d/%d/%d/%d dfs passes %d/%d", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_OLD_BRIDGE num-objects %d num_hash_entries %d sccs size %d init %.2fms df1 %.2fms sort %.2fms dfs2 %.2fms setup-cb %.2fms free-data %.2fms links %d/%d/%d/%d dfs passes %d/%d", num_registered_bridges, hash_table_size, dyn_array_scc_size (&sccs), step_1 / 10000.0f, step_2 / 10000.0f, diff --git a/mono/metadata/sgen-tarjan-bridge.c b/mono/metadata/sgen-tarjan-bridge.c index 2d26e68798d..c5a7f876502 100644 --- a/mono/metadata/sgen-tarjan-bridge.c +++ b/mono/metadata/sgen-tarjan-bridge.c @@ -1201,7 +1201,7 @@ processing_after_callback (int generation) cleanup_time = step_timer (&curtime); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_TAR_BRIDGE bridges %d objects %d opaque %d colors %d colors-bridged %d colors-visible %d xref %d cache-hit %d cache-%s %d cache-miss %d setup %.2fms tarjan %.2fms scc-setup %.2fms gather-xref %.2fms xref-setup %.2fms cleanup %.2fms", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_TAR_BRIDGE bridges %d objects %d opaque %d colors %d colors-bridged %d colors-visible %d xref %d cache-hit %d cache-%s %d cache-miss %d setup %.2fms tarjan %.2fms scc-setup %.2fms gather-xref %.2fms xref-setup %.2fms cleanup %.2fms", bridge_count, object_count, ignored_objects, color_count, colors_with_bridges_count, num_sccs, xref_count, cache_hits, (scc_precise_merge ? "abstain" : "semihit"), cache_semihits, cache_misses, diff --git a/mono/metadata/threadpool-worker-default.c b/mono/metadata/threadpool-worker-default.c index 4a497365177..27844ab2751 100644 --- a/mono/metadata/threadpool-worker-default.c +++ b/mono/metadata/threadpool-worker-default.c @@ -761,13 +761,13 @@ monitor_thread (gpointer unused) }); if (limit_worker_max_reached) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] monitor thread, limit_worker_max (%d) reached", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] monitor thread, limit_worker_max (%d) reached", GUINT_TO_POINTER (MONO_NATIVE_THREAD_ID_TO_UINT (mono_native_thread_id_get ())), worker.limit_worker_max); if (active_max_reached) continue; else - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_THREADPOOL, "[%p] monitor thread, num_active (%d) < max_working, allowing active thread increase", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_THREADPOOL, "[%p] monitor thread, num_active (%d) < max_working, allowing active thread increase", GUINT_TO_POINTER (MONO_NATIVE_THREAD_ID_TO_UINT (mono_native_thread_id_get ())), counter_num_active (counter)); } diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c index 89d284d7a71..b8c755543ea 100644 --- a/mono/mini/aot-runtime.c +++ b/mono/mini/aot-runtime.c @@ -324,7 +324,7 @@ load_image (MonoAotModule *amodule, int index, MonoError *error) } if (strcmp (assembly->image->guid, amodule->image_guids [index])) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: module %s is unusable (GUID of dependent assembly %s doesn't match (expected '%s', got '%s')).", amodule->aot_name, amodule->image_names [index].name, amodule->image_guids [index], assembly->image->guid); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: module %s is unusable (GUID of dependent assembly %s doesn't match (expected '%s', got '%s')).", amodule->aot_name, amodule->image_names [index].name, amodule->image_guids [index], assembly->image->guid); mono_error_set_bad_image_by_name (error, amodule->aot_name, "module '%s' is unusable (GUID of dependent assembly %s doesn't match (expected '%s', got '%s')).", amodule->aot_name, amodule->image_names [index].name, amodule->image_guids [index], assembly->image->guid); amodule->out_of_date = TRUE; return NULL; @@ -1642,11 +1642,11 @@ aot_cache_load_module (MonoAssembly *assembly, char **aot_name) *aot_name = fname; g_free (tmp2); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: loading from cache: '%s'.", fname); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: loading from cache: '%s'.", fname); module = mono_dl_open (fname, MONO_DL_LAZY, NULL); if (module) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: found in cache: '%s'.", fname); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: found in cache: '%s'.", fname); return module; } @@ -1657,7 +1657,7 @@ aot_cache_load_module (MonoAssembly *assembly, char **aot_name) */ return NULL; - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: not found."); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: not found."); /* Only AOT one assembly per run to avoid slowing down execution too much */ if (cache_count > 0) @@ -2169,7 +2169,7 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer if (info) { /* Statically linked AOT module */ aot_name = g_strdup_printf ("%s", assembly->aname.name); - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "Found statically linked AOT module '%s'.", aot_name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "Found statically linked AOT module '%s'.", aot_name); if (!(info->flags & MONO_AOT_FILE_FLAG_LLVM_ONLY)) { globals = (void **)info->globals; g_assert (globals); @@ -2187,7 +2187,7 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer if (sofile) { found_aot_name = g_strdup (aot_name); } else { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: image '%s' not found: %s", aot_name, err); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: image '%s' not found: %s", aot_name, err); g_free (err); } g_free (aot_name); @@ -2199,7 +2199,7 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer g_free (basename); sofile = mono_dl_open (aot_name, MONO_DL_LAZY, &err); if (!sofile) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: image '%s' not found: %s", aot_name, err); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: image '%s' not found: %s", aot_name, err); g_free (err); } g_free (aot_name); @@ -2217,7 +2217,7 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer if (sofile) { found_aot_name = g_strdup (aot_name); } else { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: image '%s' not found: %s", aot_name, err); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: image '%s' not found: %s", aot_name, err); g_free (err); } g_free (basename); @@ -2274,7 +2274,7 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer if (mono_aot_only) { g_error ("Failed to load AOT module '%s' while running in aot-only mode: %s.\n", found_aot_name, msg); } else { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: module %s is unusable: %s.", found_aot_name, msg); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: module %s is unusable: %s.", found_aot_name, msg); } g_free (msg); g_free (found_aot_name); @@ -2524,11 +2524,11 @@ load_aot_module (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer } if (amodule->out_of_date) { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: Module %s is unusable because a dependency is out-of-date.", assembly->image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: Module %s is unusable because a dependency is out-of-date.", assembly->image->name); if (mono_aot_only) g_error ("Failed to load AOT module '%s' while running in aot-only mode because a dependency cannot be found or it is out of date.\n", found_aot_name); } else { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_AOT, "AOT: image '%s' found.", found_aot_name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_AOT, "AOT: image '%s' found.", found_aot_name); } } diff --git a/mono/mini/monovm.c b/mono/mini/monovm.c index b12781cf6af..d723e5fe8fe 100644 --- a/mono/mini/monovm.c +++ b/mono/mini/monovm.c @@ -149,7 +149,7 @@ leave: if (!result) { mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "netcore preload hook: did not find '%s'.", aname->name); } else { - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "netcore preload hook: loading '%s' from '%s'.", aname->name, result->image->name); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_ASSEMBLY, "netcore preload hook: loading '%s' from '%s'.", aname->name, result->image->name); } return result; } diff --git a/mono/sgen/sgen-memory-governor.c b/mono/sgen/sgen-memory-governor.c index fb23dcbb7cd..efd2a35b445 100644 --- a/mono/sgen/sgen-memory-governor.c +++ b/mono/sgen/sgen-memory-governor.c @@ -309,7 +309,7 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) switch (entry->type) { case SGEN_LOG_NURSERY: - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MINOR%s: (%s) time %.2fms, %s promoted %luK major size: %luK in use: %luK los size: %luK in use: %luK", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_MINOR%s: (%s) time %.2fms, %s promoted %luK major size: %luK in use: %luK los size: %luK in use: %luK", entry->is_overflow ? "_OVERFLOW" : "", entry->reason ? entry->reason : "", entry->time / 10000.0f, @@ -321,7 +321,7 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) (unsigned long)entry->los_size_in_use / 1024); break; case SGEN_LOG_MAJOR_SERIAL: - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR%s: (%s) time %.2fms, %s los size: %luK in use: %luK", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_MAJOR%s: (%s) time %.2fms, %s los size: %luK in use: %luK", entry->is_overflow ? "_OVERFLOW" : "", entry->reason ? entry->reason : "", (int)entry->time / 10000.0f, @@ -330,10 +330,10 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) (unsigned long)entry->los_size_in_use / 1024); break; case SGEN_LOG_MAJOR_CONC_START: - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR_CONCURRENT_START: (%s)", entry->reason ? entry->reason : ""); + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_MAJOR_CONCURRENT_START: (%s)", entry->reason ? entry->reason : ""); break; case SGEN_LOG_MAJOR_CONC_FINISH: - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR_CONCURRENT_FINISH: (%s) time %.2fms, %s los size: %luK in use: %luK", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_MAJOR_CONCURRENT_FINISH: (%s) time %.2fms, %s los size: %luK in use: %luK", entry->reason ? entry->reason : "", entry->time / 10000.0f, full_timing_buff, @@ -341,7 +341,7 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) (unsigned long)entry->los_size_in_use / 1024); break; case SGEN_LOG_MAJOR_SWEEP_FINISH: - mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR_SWEEP: major size: %luK in use: %luK", + mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_GC, "GC_MAJOR_SWEEP: major size: %luK in use: %luK", (unsigned long)entry->major_size / 1024, (unsigned long)entry->major_size_in_use / 1024); break; -- 2.11.4.GIT