8331392: G1: Make HRPrinter distinguish between different types of re…

…clamation

Reviewed-by: ayang, iwalulya, gli

src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

@@ -1317,7 +1317,7 @@ class G1UpdateRegionLivenessAndSelectForRebuildTask : public WorkerTask {
     if (!_cleanup_list.is_empty()) {
       log_debug(gc)("Reclaimed %u empty regions", _cleanup_list.length());
       // Now print the empty regions list.
-      _g1h->hr_printer()->cleanup(&_cleanup_list);
+      _g1h->hr_printer()->mark_reclaim(&_cleanup_list);
       // And actually make them available.
       _g1h->prepend_to_freelist(&_cleanup_list);
     }

src/hotspot/share/gc/g1/g1HRPrinter.cpp

@@ -27,12 +27,12 @@
 #include "gc/g1/g1HeapRegionSet.hpp"
 #include "gc/g1/g1HRPrinter.hpp"
 
-void G1HRPrinter::cleanup(FreeRegionList* cleanup_list) {
+void G1HRPrinter::mark_reclaim(FreeRegionList* cleanup_list) {
   if (is_active()) {
     FreeRegionListIterator iter(cleanup_list);
     while (iter.more_available()) {
       HeapRegion* hr = iter.get_next();
-      cleanup(hr);
+      mark_reclaim(hr);
     }
   }
 }

src/hotspot/share/gc/g1/g1HRPrinter.hpp

@@ -40,6 +40,10 @@ class G1HRPrinter {
                           action, hr->get_type_str(), p2i(hr->bottom()), p2i(hr->top()), p2i(hr->end()));
   }
 
+  void mark_reclaim(HeapRegion* hr) {
+    print("MARK-RECLAIM", hr);
+  }
+
 public:
   // In some places we iterate over a list in order to generate output
   // for the list's elements. By exposing this we can avoid this
@@ -78,13 +82,19 @@ class G1HRPrinter {
     }
   }
 
-  void cleanup(HeapRegion* hr) {
+  void mark_reclaim(FreeRegionList* free_list);
+
+  void eager_reclaim(HeapRegion* hr) {
     if (is_active()) {
-      print("CLEANUP", hr);
+      print("EAGER-RECLAIM", hr);
     }
   }
 
-  void cleanup(FreeRegionList* free_list);
+  void evac_reclaim(HeapRegion* hr) {
+    if (is_active()) {
+      print("EVAC-RECLAIM", hr);
+    }
+  }
 
   void post_compaction(HeapRegion* hr) {
     if (is_active()) {

src/hotspot/share/gc/g1/g1YoungGCPostEvacuateTasks.cpp

@@ -412,7 +412,7 @@ class G1FreeHumongousRegionClosure : public HeapRegionIndexClosure {
       r->set_containing_set(nullptr);
       _humongous_regions_reclaimed++;
       _g1h->free_humongous_region(r, nullptr);
-      _g1h->hr_printer()->cleanup(r);
+      _g1h->hr_printer()->eager_reclaim(r);
     };
 
     _g1h->humongous_obj_regions_iterate(r, free_humongous_region);
@@ -760,7 +760,7 @@ class FreeCSetClosure : public HeapRegionClosure {
 
     // Free the region and its remembered set.
     _g1h->free_region(r, nullptr);
-    _g1h->hr_printer()->cleanup(r);
+    _g1h->hr_printer()->evac_reclaim(r);
   }
 
   void handle_failed_region(HeapRegion* r) {