[sgen] Use gc_stats minor and major collection counts instead of local variable

diff --git a/mono/metadata/sgen-alloc.c b/mono/metadata/sgen-alloc.c
index 6d18fc6e7ec51da5aef334da17d972163acda704..254f15d5bbca9ab7e24b130945f000c5fee7617d 100644 (file)
--- a/mono/metadata/sgen-alloc.c
+++ b/mono/metadata/sgen-alloc.c
@@ -118,13 +118,13 @@ alloc_degraded (MonoVTable *vtable, size_t size, gboolean for_mature)
        void *p;
 
        if (!for_mature) {
-               if (last_major_gc_warned < stat_major_gcs) {
+               if (last_major_gc_warned < gc_stats.major_gc_count) {
                        ++num_degraded;
                        if (num_degraded == 1 || num_degraded == 3)
                                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "Warning: Degraded allocation.  Consider increasing nursery-size if the warning persists.");
                        else if (num_degraded == 10)
                                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_GC, "Warning: Repeated degraded allocation.  Consider increasing nursery-size.");
-                       last_major_gc_warned = stat_major_gcs;
+                       last_major_gc_warned = gc_stats.major_gc_count;
                }
                SGEN_ATOMIC_ADD_P (degraded_mode, size);
                sgen_ensure_free_space (size);

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index b3c69379e81e737304ea59e6616455b287b9fb17..c39589ab7249dc7276aee6d7195a460b07b1786c 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -322,9 +322,6 @@ static int stat_wbarrier_value_copy = 0;
 static int stat_wbarrier_object_copy = 0;
 #endif
 
-int stat_minor_gcs = 0;
-int stat_major_gcs = 0;
-
 static long long stat_pinned_objects = 0;
 
 static long long time_minor_pre_collection_fragment_clear = 0;
@@ -2211,7 +2208,7 @@ collect_nursery (SgenGrayQueue *unpin_queue, gboolean finish_up_concurrent_mark)
                return TRUE;
 
        MONO_GC_BEGIN (GENERATION_NURSERY);
-       binary_protocol_collection_begin (stat_minor_gcs, GENERATION_NURSERY);
+       binary_protocol_collection_begin (gc_stats.minor_gc_count, GENERATION_NURSERY);
 
        verify_nursery ();
 
@@ -2237,7 +2234,7 @@ collect_nursery (SgenGrayQueue *unpin_queue, gboolean finish_up_concurrent_mark)
        /* FIXME: optimize later to use the higher address where an object can be present */
        nursery_next = MAX (nursery_next, sgen_get_nursery_end ());
 
-       SGEN_LOG (1, "Start nursery collection %d %p-%p, size: %d", stat_minor_gcs, sgen_get_nursery_start (), nursery_next, (int)(nursery_next - sgen_get_nursery_start ()));
+       SGEN_LOG (1, "Start nursery collection %d %p-%p, size: %d", gc_stats.minor_gc_count, sgen_get_nursery_start (), nursery_next, (int)(nursery_next - sgen_get_nursery_start ()));
        max_garbage_amount = nursery_next - sgen_get_nursery_start ();
        g_assert (nursery_section->size >= max_garbage_amount);
 
@@ -2261,7 +2258,6 @@ collect_nursery (SgenGrayQueue *unpin_queue, gboolean finish_up_concurrent_mark)
 
        init_gray_queue ();
 
-       stat_minor_gcs++;
        gc_stats.minor_gc_count ++;
 
        MONO_GC_CHECKPOINT_1 (GENERATION_NURSERY);
@@ -2429,7 +2425,7 @@ collect_nursery (SgenGrayQueue *unpin_queue, gboolean finish_up_concurrent_mark)
        gc_stats.minor_gc_time_usecs += TV_ELAPSED (all_atv, all_btv);
 
        if (heap_dump_file)
-               dump_heap ("minor", stat_minor_gcs - 1, NULL);
+               dump_heap ("minor", gc_stats.minor_gc_count - 1, NULL);
 
        /* prepare the pin queue for the next collection */
        sgen_finish_pinning ();
@@ -2457,7 +2453,7 @@ collect_nursery (SgenGrayQueue *unpin_queue, gboolean finish_up_concurrent_mark)
        objects_pinned = 0;
 
        MONO_GC_END (GENERATION_NURSERY);
-       binary_protocol_collection_end (stat_minor_gcs - 1, GENERATION_NURSERY);
+       binary_protocol_collection_end (gc_stats.minor_gc_count - 1, GENERATION_NURSERY);
 
        if (check_nursery_objects_pinned && !sgen_minor_collector.is_split)
                sgen_check_nursery_objects_pinned (unpin_queue != NULL);
@@ -2755,7 +2751,7 @@ static void
 major_start_collection (gboolean concurrent, size_t *old_next_pin_slot)
 {
        MONO_GC_BEGIN (GENERATION_OLD);
-       binary_protocol_collection_begin (stat_major_gcs, GENERATION_OLD);
+       binary_protocol_collection_begin (gc_stats.major_gc_count, GENERATION_OLD);
 
        current_collection_generation = GENERATION_OLD;
 #ifndef DISABLE_PERFCOUNTERS
@@ -2785,8 +2781,7 @@ major_start_collection (gboolean concurrent, size_t *old_next_pin_slot)
        check_scan_starts ();
 
        degraded_mode = 0;
-       SGEN_LOG (1, "Start major collection %d", stat_major_gcs);
-       stat_major_gcs++;
+       SGEN_LOG (1, "Start major collection %d", gc_stats.major_gc_count);
        gc_stats.major_gc_count ++;
 
        if (major_collector.start_major_collection)
@@ -2945,7 +2940,7 @@ major_finish_collection (const char *reason, size_t old_next_pin_slot, gboolean
        time_major_fragment_creation += TV_ELAPSED (btv, atv);
 
        if (heap_dump_file)
-               dump_heap ("major", stat_major_gcs - 1, reason);
+               dump_heap ("major", gc_stats.major_gc_count - 1, reason);
 
        if (fin_ready_list || critical_fin_list) {
                SGEN_LOG (4, "Finalizer-thread wakeup: ready %d", num_ready_finalizers);
@@ -2971,7 +2966,7 @@ major_finish_collection (const char *reason, size_t old_next_pin_slot, gboolean
        //consistency_check ();
 
        MONO_GC_END (GENERATION_OLD);
-       binary_protocol_collection_end (stat_major_gcs - 1, GENERATION_OLD);
+       binary_protocol_collection_end (gc_stats.major_gc_count - 1, GENERATION_OLD);
 }
 
 static gboolean
@@ -4319,8 +4314,8 @@ int
 mono_gc_collection_count (int generation)
 {
        if (generation == 0)
-               return stat_minor_gcs;
-       return stat_major_gcs;
+               return gc_stats.minor_gc_count;
+       return gc_stats.major_gc_count;
 }
 
 int64_t

diff --git a/mono/metadata/sgen-gc.h b/mono/metadata/sgen-gc.h
index 036304d58086369b70416f90a8873beb463acefd..3d751d6d0b0ad24b05d1b419926d561ce5109230 100644 (file)
--- a/mono/metadata/sgen-gc.h
+++ b/mono/metadata/sgen-gc.h
@@ -1081,7 +1081,6 @@ extern __thread char *stack_end;
 /* Other globals */
 
 extern GCMemSection *nursery_section;
-extern int stat_major_gcs;
 extern guint32 collect_before_allocs;
 extern guint32 verify_before_allocs;
 extern gboolean has_per_allocation_action;