8273218: G1: Rename g1EvacuationInfo to g1EvacInfo

Reviewed-by: tschatzl, ayang

Author: Hamlin Li

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

@@ -25,8 +25,8 @@
 #include "precompiled.hpp"
 #include "gc/g1/g1Allocator.inline.hpp"
 #include "gc/g1/g1AllocRegion.inline.hpp"
+#include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
-#include "gc/g1/g1EvacuationInfo.hpp"
 #include "gc/g1/g1CollectedHeap.inline.hpp"
 #include "gc/g1/g1NUMA.hpp"
 #include "gc/g1/g1Policy.hpp"
@@ -91,7 +91,7 @@ bool G1Allocator::is_retained_old_region(HeapRegion* hr) {
   return _retained_old_gc_alloc_region == hr;
 }
 
-void G1Allocator::reuse_retained_old_region(G1EvacuationInfo* evacuation_info,
+void G1Allocator::reuse_retained_old_region(G1EvacInfo* evacuation_info,
                                             OldGCAllocRegion* old,
                                             HeapRegion** retained_old) {
   HeapRegion* retained_region = *retained_old;
@@ -124,7 +124,7 @@ void G1Allocator::reuse_retained_old_region(G1EvacuationInfo* evacuation_info,
   }
 }
 
-void G1Allocator::init_gc_alloc_regions(G1EvacuationInfo* evacuation_info) {
+void G1Allocator::init_gc_alloc_regions(G1EvacInfo* evacuation_info) {
   assert_at_safepoint_on_vm_thread();
 
   _survivor_is_full = false;
@@ -140,7 +140,7 @@ void G1Allocator::init_gc_alloc_regions(G1EvacuationInfo* evacuation_info) {
                             &_retained_old_gc_alloc_region);
 }
 
-void G1Allocator::release_gc_alloc_regions(G1EvacuationInfo* evacuation_info) {
+void G1Allocator::release_gc_alloc_regions(G1EvacInfo* evacuation_info) {
   uint survivor_region_count = 0;
   for (uint node_index = 0; node_index < _num_alloc_regions; node_index++) {
     survivor_region_count += survivor_gc_alloc_region(node_index)->count();

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

@@ -30,7 +30,7 @@
 #include "gc/shared/collectedHeap.hpp"
 #include "gc/shared/plab.hpp"
 
-class G1EvacuationInfo;
+class G1EvacInfo;
 class G1NUMA;
 
 // Interface to keep track of which regions G1 is currently allocating into. Provides
@@ -68,7 +68,7 @@ class G1Allocator : public CHeapObj<mtGC> {
   void set_survivor_full();
   void set_old_full();
 
-  void reuse_retained_old_region(G1EvacuationInfo* evacuation_info,
+  void reuse_retained_old_region(G1EvacInfo* evacuation_info,
                                  OldGCAllocRegion* old,
                                  HeapRegion** retained);
 
@@ -105,8 +105,8 @@ class G1Allocator : public CHeapObj<mtGC> {
   void init_mutator_alloc_regions();
   void release_mutator_alloc_regions();
 
-  void init_gc_alloc_regions(G1EvacuationInfo* evacuation_info);
-  void release_gc_alloc_regions(G1EvacuationInfo* evacuation_info);
+  void init_gc_alloc_regions(G1EvacInfo* evacuation_info);
+  void release_gc_alloc_regions(G1EvacInfo* evacuation_info);
   void abandon_gc_alloc_regions();
   bool is_retained_old_region(HeapRegion* hr);
 

src/hotspot/share/gc/g1/g1EvacuationInfo.hpp src/hotspot/share/gc/g1/g1EvacInfo.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,12 +22,12 @@
  *
  */
 
-#ifndef SHARE_GC_G1_G1EVACUATIONINFO_HPP
-#define SHARE_GC_G1_G1EVACUATIONINFO_HPP
+#ifndef SHARE_GC_G1_G1EVACINFO_HPP
+#define SHARE_GC_G1_G1EVACINFO_HPP
 
 #include "memory/allocation.hpp"
 
-class G1EvacuationInfo : public StackObj {
+class G1EvacInfo : public StackObj {
   uint _collectionset_regions;
   uint _allocation_regions;
   size_t _collectionset_used_before;
@@ -37,7 +37,7 @@ class G1EvacuationInfo : public StackObj {
   uint   _regions_freed;
 
 public:
-  G1EvacuationInfo() :
+  G1EvacInfo() :
     _collectionset_regions(0), _allocation_regions(0), _collectionset_used_before(0),
     _collectionset_used_after(0), _alloc_regions_used_before(0),
     _bytes_used(0), _regions_freed(0) { }
@@ -79,4 +79,4 @@ class G1EvacuationInfo : public StackObj {
   uint   regions_freed()             { return _regions_freed; }
 };
 
-#endif // SHARE_GC_G1_G1EVACUATIONINFO_HPP
+#endif // SHARE_GC_G1_G1EVACINFO_HPP

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

@@ -23,7 +23,7 @@
  */
 
 #include "precompiled.hpp"
-#include "gc/g1/g1EvacuationInfo.hpp"
+#include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1HeapRegionTraceType.hpp"
 #include "gc/g1/g1Trace.hpp"
 #include "gc/g1/g1GCPauseType.hpp"
@@ -83,7 +83,7 @@ void G1NewTracer::report_gc_end_impl(const Ticks& timestamp, TimePartitions* tim
   send_g1_young_gc_event();
 }
 
-void G1NewTracer::report_evacuation_info(G1EvacuationInfo* info) {
+void G1NewTracer::report_evacuation_info(G1EvacInfo* info) {
   send_evacuation_info_event(info);
 }
 
@@ -141,7 +141,7 @@ void G1NewTracer::send_g1_young_gc_event() {
   }
 }
 
-void G1NewTracer::send_evacuation_info_event(G1EvacuationInfo* info) {
+void G1NewTracer::send_evacuation_info_event(G1EvacInfo* info) {
   EventEvacuationInformation e;
   if (e.should_commit()) {
     e.set_gcId(GCId::current());

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

@@ -28,7 +28,7 @@
 #include "gc/g1/g1GCPauseType.hpp"
 #include "gc/shared/gcTrace.hpp"
 
-class G1EvacuationInfo;
+class G1EvacInfo;
 class G1HeapSummary;
 class G1EvacSummary;
 
@@ -45,7 +45,7 @@ class G1NewTracer : public YoungGCTracer {
   void initialize();
   void report_young_gc_pause(G1GCPauseType pause);
   void report_gc_end_impl(const Ticks& timestamp, TimePartitions* time_partitions);
-  void report_evacuation_info(G1EvacuationInfo* info);
+  void report_evacuation_info(G1EvacInfo* info);
   void report_evacuation_failed(EvacuationFailedInfo& ef_info);
 
   void report_evacuation_statistics(const G1EvacSummary& young_summary, const G1EvacSummary& old_summary) const;
@@ -65,7 +65,7 @@ class G1NewTracer : public YoungGCTracer {
                                        bool prediction_active);
 private:
   void send_g1_young_gc_event();
-  void send_evacuation_info_event(G1EvacuationInfo* info);
+  void send_evacuation_info_event(G1EvacInfo* info);
   void send_evacuation_failed_event(const EvacuationFailedInfo& ef_info) const;
 
   void send_young_evacuation_statistics(const G1EvacSummary& summary) const;

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

@@ -33,7 +33,7 @@
 #include "gc/g1/g1ConcurrentMark.hpp"
 #include "gc/g1/g1GCPhaseTimes.hpp"
 #include "gc/g1/g1YoungGCEvacFailureInjector.hpp"
-#include "gc/g1/g1EvacuationInfo.hpp"
+#include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1HRPrinter.hpp"
 #include "gc/g1/g1HotCardCache.hpp"
 #include "gc/g1/g1MonitoringSupport.hpp"
@@ -146,13 +146,13 @@ class G1YoungGCNotifyPauseMark : public StackObj {
 };
 
 class G1YoungGCJFRTracerMark : public G1JFRTracerMark {
-  G1EvacuationInfo _evacuation_info;
+  G1EvacInfo _evacuation_info;
 
   G1NewTracer* tracer() const { return (G1NewTracer*)_tracer; }
 
 public:
 
-  G1EvacuationInfo* evacuation_info() { return &_evacuation_info; }
+  G1EvacInfo* evacuation_info() { return &_evacuation_info; }
 
   G1YoungGCJFRTracerMark(STWGCTimer* gc_timer_stw, G1NewTracer* gc_tracer_stw, GCCause::Cause cause) :
     G1JFRTracerMark(gc_timer_stw, gc_tracer_stw), _evacuation_info() { }
@@ -288,7 +288,7 @@ class G1PrintCollectionSetClosure : public HeapRegionClosure {
   }
 };
 
-void G1YoungCollector::calculate_collection_set(G1EvacuationInfo* evacuation_info, double target_pause_time_ms) {
+void G1YoungCollector::calculate_collection_set(G1EvacInfo* evacuation_info, double target_pause_time_ms) {
   // Forget the current allocation region (we might even choose it to be part
   // of the collection set!) before finalizing the collection set.
   allocator()->release_mutator_alloc_regions();
@@ -492,7 +492,7 @@ void G1YoungCollector::set_young_collection_default_active_worker_threads(){
   log_info(gc,task)("Using %u workers of %u for evacuation", active_workers, workers()->total_workers());
 }
 
-void G1YoungCollector::pre_evacuate_collection_set(G1EvacuationInfo* evacuation_info, G1ParScanThreadStateSet* per_thread_states) {
+void G1YoungCollector::pre_evacuate_collection_set(G1EvacInfo* evacuation_info, G1ParScanThreadStateSet* per_thread_states) {
   // Please see comment in g1CollectedHeap.hpp and
   // G1CollectedHeap::ref_processing_init() to see how
   // reference processing currently works in G1.
@@ -962,7 +962,7 @@ void G1YoungCollector::post_evacuate_cleanup_1(G1ParScanThreadStateSet* per_thre
 }
 
 void G1YoungCollector::post_evacuate_cleanup_2(G1ParScanThreadStateSet* per_thread_states,
-                                               G1EvacuationInfo* evacuation_info) {
+                                               G1EvacInfo* evacuation_info) {
   Ticks start = Ticks::now();
   {
     G1PostEvacuateCollectionSetCleanupTask2 cl(per_thread_states, evacuation_info, _evac_failure_regions);
@@ -971,7 +971,7 @@ void G1YoungCollector::post_evacuate_cleanup_2(G1ParScanThreadStateSet* per_thre
   phase_times()->record_post_evacuate_cleanup_task_2_time((Ticks::now() - start).seconds() * 1000.0);
 }
 
-void G1YoungCollector::post_evacuate_collection_set(G1EvacuationInfo* evacuation_info,
+void G1YoungCollector::post_evacuate_collection_set(G1EvacInfo* evacuation_info,
                                                     G1ParScanThreadStateSet* per_thread_states) {
   G1GCPhaseTimes* p = phase_times();
 

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

@@ -38,7 +38,7 @@ class G1CollectionSet;
 class G1CollectorState;
 class G1ConcurrentMark;
 class G1EvacFailureRegions;
-class G1EvacuationInfo;
+class G1EvacInfo;
 class G1GCPhaseTimes;
 class G1HotCardCache;
 class G1HRPrinter;
@@ -88,11 +88,11 @@ class G1YoungCollector {
 
   void wait_for_root_region_scanning();
 
-  void calculate_collection_set(G1EvacuationInfo* evacuation_info, double target_pause_time_ms);
+  void calculate_collection_set(G1EvacInfo* evacuation_info, double target_pause_time_ms);
 
   void set_young_collection_default_active_worker_threads();
 
-  void pre_evacuate_collection_set(G1EvacuationInfo* evacuation_info, G1ParScanThreadStateSet* pss);
+  void pre_evacuate_collection_set(G1EvacInfo* evacuation_info, G1ParScanThreadStateSet* pss);
   // Actually do the work of evacuating the parts of the collection set.
   // The has_optional_evacuation_work flag for the initial collection set
   // evacuation indicates whether one or more optional evacuation steps may
@@ -119,9 +119,9 @@ class G1YoungCollector {
   void process_discovered_references(G1ParScanThreadStateSet* per_thread_states);
   void post_evacuate_cleanup_1(G1ParScanThreadStateSet* per_thread_states);
   void post_evacuate_cleanup_2(G1ParScanThreadStateSet* per_thread_states,
-                               G1EvacuationInfo* evacuation_info);
+                               G1EvacInfo* evacuation_info);
 
-  void post_evacuate_collection_set(G1EvacuationInfo* evacuation_info,
+  void post_evacuate_collection_set(G1EvacInfo* evacuation_info,
                                     G1ParScanThreadStateSet* per_thread_states);
 
   G1EvacFailureRegions* _evac_failure_regions;

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

@@ -31,7 +31,7 @@
 #include "gc/g1/g1CollectionSetCandidates.hpp"
 #include "gc/g1/g1ConcurrentMark.inline.hpp"
 #include "gc/g1/g1EvacStats.inline.hpp"
-#include "gc/g1/g1EvacuationInfo.hpp"
+#include "gc/g1/g1EvacInfo.hpp"
 #include "gc/g1/g1ParScanThreadState.hpp"
 #include "gc/g1/g1RemSet.hpp"
 #include "gc/g1/g1YoungGCPostEvacuateTasks.hpp"
@@ -394,7 +394,7 @@ class FreeCSetStats {
     _regions_freed += other->_regions_freed;
   }
 
-  void report(G1CollectedHeap* g1h, G1EvacuationInfo* evacuation_info) {
+  void report(G1CollectedHeap* g1h, G1EvacInfo* evacuation_info) {
     evacuation_info->set_regions_freed(_regions_freed);
     evacuation_info->increment_collectionset_used_after(_after_used_bytes);
 
@@ -576,7 +576,7 @@ void G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask::report_stat
 }
 
 G1PostEvacuateCollectionSetCleanupTask2::
-      FreeCollectionSetTask::FreeCollectionSetTask(G1EvacuationInfo* evacuation_info,
+      FreeCollectionSetTask::FreeCollectionSetTask(G1EvacInfo* evacuation_info,
                                                    const size_t* surviving_young_words,
                                                    G1EvacFailureRegions* evac_failure_regions) :
     G1AbstractSubTask(G1GCPhaseTimes::FreeCollectionSet),
@@ -622,7 +622,7 @@ void G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask::do_work(uin
 }
 
 G1PostEvacuateCollectionSetCleanupTask2::G1PostEvacuateCollectionSetCleanupTask2(G1ParScanThreadStateSet* per_thread_states,
-                                                                                 G1EvacuationInfo* evacuation_info,
+                                                                                 G1EvacInfo* evacuation_info,
                                                                                  G1EvacFailureRegions* evac_failure_regions) :
   G1BatchedGangTask("Post Evacuate Cleanup 2", G1CollectedHeap::heap()->phase_times())
 {

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

@@ -32,7 +32,7 @@ class FreeCSetStats;
 
 class G1CollectedHeap;
 class G1EvacFailureRegions;
-class G1EvacuationInfo;
+class G1EvacInfo;
 class G1ParScanThreadStateSet;
 class G1RedirtyCardsQueueSet;
 
@@ -117,7 +117,7 @@ class G1PostEvacuateCollectionSetCleanupTask2 : public G1BatchedGangTask {
 
 public:
   G1PostEvacuateCollectionSetCleanupTask2(G1ParScanThreadStateSet* per_thread_states,
-                                          G1EvacuationInfo* evacuation_info,
+                                          G1EvacInfo* evacuation_info,
                                           G1EvacFailureRegions* evac_failure_regions);
 };
 
@@ -190,7 +190,7 @@ class G1PostEvacuateCollectionSetCleanupTask2::RedirtyLoggedCardsTask : public G
 
 class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1AbstractSubTask {
   G1CollectedHeap*  _g1h;
-  G1EvacuationInfo* _evacuation_info;
+  G1EvacInfo* _evacuation_info;
   FreeCSetStats*    _worker_stats;
   HeapRegionClaimer _claimer;
   const size_t*     _surviving_young_words;
@@ -201,7 +201,7 @@ class G1PostEvacuateCollectionSetCleanupTask2::FreeCollectionSetTask : public G1
   void report_statistics();
 
 public:
-  FreeCollectionSetTask(G1EvacuationInfo* evacuation_info,
+  FreeCollectionSetTask(G1EvacInfo* evacuation_info,
                         const size_t* surviving_young_words,
                         G1EvacFailureRegions* evac_failure_regions);
   virtual ~FreeCollectionSetTask();