[sgen] Fix build with heavy statistics.
authorMark Probst <mark.probst@gmail.com>
Tue, 7 Oct 2014 00:11:50 +0000 (17:11 -0700)
committerMark Probst <mark.probst@gmail.com>
Wed, 26 Nov 2014 18:38:45 +0000 (10:38 -0800)
mono/metadata/sgen-marksweep.c

index f71101b29e3db734e2a215dc73a14c05b6dd842f..01e5cca3597ed689de5e3190fac93fd05fe345e7 100644 (file)
@@ -995,9 +995,8 @@ static long long stat_optimized_copy_major_small_fast;
 static long long stat_optimized_copy_major_small_slow;
 static long long stat_optimized_copy_major_large;
 #endif
-static long long stat_optimized_major_mark;
-static long long stat_optimized_major_mark_small;
-static long long stat_optimized_major_mark_large;
+static long long stat_optimized_copy_major_forwarded;
+static long long stat_optimized_copy_major_small_evacuate;
 static long long stat_optimized_major_scan;
 static long long stat_optimized_major_scan_no_refs;
 #ifdef DESCRIPTOR_FAST_PATH
@@ -2166,9 +2165,6 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
        mono_counters_register ("Optimized copy major small slow", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_copy_major_small_slow);
        mono_counters_register ("Optimized copy major large", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_copy_major_large);
 #endif
-       mono_counters_register ("Optimized major mark", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_major_mark);
-       mono_counters_register ("Optimized major mark small", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_major_mark_small);
-       mono_counters_register ("Optimized major mark large", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_major_mark_large);
        mono_counters_register ("Optimized major scan", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_major_scan);
        mono_counters_register ("Optimized major scan no refs", MONO_COUNTER_GC | MONO_COUNTER_LONG, &stat_optimized_major_scan_no_refs);
 #ifdef DESCRIPTOR_FAST_PATH
@@ -2182,7 +2178,7 @@ sgen_marksweep_init_internal (SgenMajorCollector *collector, gboolean is_concurr
 #endif
 #endif
 
-#ifdef HEAVY_STATISTICS
+#ifdef SGEN_HEAVY_BINARY_PROTOCOL
        mono_mutex_init (&scanned_objects_list_lock);
 #endif