X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fsgen-memory-governor.c;h=7cc97ee45bf7b961206d7a2da48d51be713a28c1;hb=57ade9dfca648f4970d4c48ebd96d1a02be9e975;hp=7dc35fdbe3e88d61c372dd6aa97612c931b72960;hpb=18d7a36fdd6e01fbc05bdb8eb0e3ee2a0ff7f9ce;p=mono.git

diff --git a/mono/metadata/sgen-memory-governor.c b/mono/metadata/sgen-memory-governor.c
index 7dc35fdbe3e..7cc97ee45bf 100644
--- a/mono/metadata/sgen-memory-governor.c
+++ b/mono/metadata/sgen-memory-governor.c
@@ -139,11 +139,11 @@ sgen_memgov_try_calculate_minor_collection_allowance (gboolean overwrite)
 	if (debug_print_allowance) {
 		mword old_major = last_collection_old_num_major_sections * major_collector.section_size;
 
-		SGEN_LOG (1, "Before collection: %td bytes (%td major, %td LOS)",
-				old_major + last_collection_old_los_memory_usage, old_major, last_collection_old_los_memory_usage);
-		SGEN_LOG (1, "After collection: %td bytes (%td major, %td LOS)",
-				new_heap_size, new_major, last_collection_los_memory_usage);
-		SGEN_LOG (1, "Allowance: %td bytes", minor_collection_allowance);
+		SGEN_LOG (1, "Before collection: %ld bytes (%ld major, %ld LOS)",
+				  (long)(old_major + last_collection_old_los_memory_usage), (long)old_major, (long)last_collection_old_los_memory_usage);
+		SGEN_LOG (1, "After collection: %ld bytes (%ld major, %ld LOS)",
+				  (long)new_heap_size, (long)new_major, (long)last_collection_los_memory_usage);
+		SGEN_LOG (1, "Allowance: %ld bytes", (long)minor_collection_allowance);
 	}
 
 	if (major_collector.have_computed_minor_collection_allowance)
@@ -215,7 +215,7 @@ log_timming (GGTimingInfo *info)
 	full_timing_buff [0] = '\0';
 
 	if (!info->is_overflow)
-	        sprintf (full_timing_buff, "total %.2fms, bridge %.2f", info->stw_time / 1000.0f, (int)info->bridge_time / 1000.0f);
+	        sprintf (full_timing_buff, "total %.2fms, bridge %.2fms", info->stw_time / 1000.0f, (int)info->bridge_time / 1000.0f);
 	if (info->generation == GENERATION_OLD)
 	        mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "GC_MAJOR%s: (%s) pause %.2fms, %s major %dK/%dK los %dK/%dK",
 	                info->is_overflow ? "_OVERFLOW" : "",
@@ -390,6 +390,7 @@ sgen_memgov_init (glong max_heap, glong soft_limit, gboolean debug_allowance, do
 		soft_heap_limit = soft_limit;
 
 	debug_print_allowance = debug_allowance;
+	minor_collection_allowance = MIN_MINOR_COLLECTION_ALLOWANCE;
 
 	if (max_heap == 0)
 		return;
@@ -405,13 +406,12 @@ sgen_memgov_init (glong max_heap, glong soft_limit, gboolean debug_allowance, do
 	}
 	max_heap_size = max_heap - sgen_nursery_size;
 
-	minor_collection_allowance = MIN_MINOR_COLLECTION_ALLOWANCE;
-
 	if (allowance_ratio)
 		default_allowance_nursery_size_ratio = allowance_ratio;
 
 	if (save_target)
 		save_target_ratio = save_target;
+	minor_collection_allowance = MIN_MINOR_COLLECTION_ALLOWANCE;
 }
 
 #endif