From da859cdc932883274027c9d304ee028e499c1484 Mon Sep 17 00:00:00 2001 From: Aleksey Kliger Date: Fri, 30 Sep 2016 18:53:32 -0400 Subject: [PATCH] [sgen] Fix printf-like format warnings --- mono/metadata/sgen-new-bridge.c | 2 +- mono/sgen/sgen-memory-governor.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mono/metadata/sgen-new-bridge.c b/mono/metadata/sgen-new-bridge.c index 501ceb76d5b..cdfbb64c027 100644 --- a/mono/metadata/sgen-new-bridge.c +++ b/mono/metadata/sgen-new-bridge.c @@ -1030,7 +1030,7 @@ processing_after_callback (int generation) 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, - "OBJECT %s (%p) SCC [%d] %s", + "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, api_sccs [i]->is_alive ? "ALIVE" : "DEAD"); diff --git a/mono/sgen/sgen-memory-governor.c b/mono/sgen/sgen-memory-governor.c index dc69381547f..d6c7f130f3c 100644 --- a/mono/sgen/sgen-memory-governor.c +++ b/mono/sgen/sgen-memory-governor.c @@ -295,7 +295,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 %dK major size: %dK in use: %dK los size: %dK in use: %dK", + mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MINOR%s: (%s) time %.2fms, %s promoted %zdK major size: %zdK in use: %zdK los size: %zdK in use: %zdK", entry->is_overflow ? "_OVERFLOW" : "", entry->reason ? entry->reason : "", entry->time / 10000.0f, @@ -307,7 +307,7 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) 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: %dK in use: %dK", + mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR%s: (%s) time %.2fms, %s los size: %zdK in use: %zdK", entry->is_overflow ? "_OVERFLOW" : "", entry->reason ? entry->reason : "", (int)entry->time / 10000.0f, @@ -319,7 +319,7 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) mono_trace (G_LOG_LEVEL_INFO, 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: %dK in use: %dK", + mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR_CONCURRENT_FINISH: (%s) time %.2fms, %s los size: %zdK in use: %zdK", entry->reason ? entry->reason : "", entry->time / 10000.0f, full_timing_buff, @@ -327,7 +327,7 @@ sgen_output_log_entry (SgenLogEntry *entry, gint64 stw_time, int generation) 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: %dK in use: %dK", + mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR_SWEEP: major size: %zdK in use: %zdK", entry->major_size / 1024, entry->major_size_in_use / 1024); break; -- 2.25.1