8362271: G1: Improve G1CollectorState::clearing_bitmap name

Reviewed-by: sangheki

Author: Thomas Schatzl

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2025, 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
@@ -65,7 +65,7 @@ class G1CollectorState {
   bool _mark_or_rebuild_in_progress;
 
   // The marking bitmap is currently being cleared or about to be cleared.
-  bool _clearing_bitmap;
+  bool _clear_bitmap_in_progress;
 
   // Set during a full gc pause.
   bool _in_full_gc;
@@ -79,7 +79,7 @@ class G1CollectorState {
     _initiate_conc_mark_if_possible(false),
 
     _mark_or_rebuild_in_progress(false),
-    _clearing_bitmap(false),
+    _clear_bitmap_in_progress(false),
     _in_full_gc(false) { }
 
   // Phase setters
@@ -93,7 +93,7 @@ class G1CollectorState {
   void set_initiate_conc_mark_if_possible(bool v) { _initiate_conc_mark_if_possible = v; }
 
   void set_mark_or_rebuild_in_progress(bool v) { _mark_or_rebuild_in_progress = v; }
-  void set_clearing_bitmap(bool v) { _clearing_bitmap = v; }
+  void set_clear_bitmap_in_progress(bool v) { _clear_bitmap_in_progress = v; }
 
   // Phase getters
   bool in_young_only_phase() const { return _in_young_only_phase && !_in_full_gc; }
@@ -107,7 +107,7 @@ class G1CollectorState {
   bool initiate_conc_mark_if_possible() const { return _initiate_conc_mark_if_possible; }
 
   bool mark_or_rebuild_in_progress() const { return _mark_or_rebuild_in_progress; }
-  bool clearing_bitmap() const { return _clearing_bitmap; }
+  bool clear_bitmap_in_progress() const { return _clear_bitmap_in_progress; }
 
   // Calculate GC Pause Type from internal state.
   G1GCPauseType young_gc_pause_type(bool concurrent_operation_is_full_mark) const;

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

@@ -1113,7 +1113,7 @@ uint G1ConcurrentMark::completed_mark_cycles() const {
 }
 
 void G1ConcurrentMark::concurrent_cycle_end(bool mark_cycle_completed) {
-  _g1h->collector_state()->set_clearing_bitmap(false);
+  _g1h->collector_state()->set_clear_bitmap_in_progress(false);
 
   _g1h->trace_heap_after_gc(_gc_tracer_cm);
 

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

@@ -594,7 +594,7 @@ void G1Policy::record_full_collection_end() {
   collector_state()->set_initiate_conc_mark_if_possible(need_to_start_conc_mark("end of Full GC"));
   collector_state()->set_in_concurrent_start_gc(false);
   collector_state()->set_mark_or_rebuild_in_progress(false);
-  collector_state()->set_clearing_bitmap(false);
+  collector_state()->set_clear_bitmap_in_progress(false);
 
   _eden_surv_rate_group->start_adding_regions();
   // also call this on any additional surv rate groups
@@ -1318,7 +1318,7 @@ void G1Policy::record_concurrent_mark_cleanup_end(bool has_rebuilt_remembered_se
   }
   collector_state()->set_in_young_gc_before_mixed(mixed_gc_pending);
   collector_state()->set_mark_or_rebuild_in_progress(false);
-  collector_state()->set_clearing_bitmap(true);
+  collector_state()->set_clear_bitmap_in_progress(true);
 
   double end_sec = os::elapsedTime();
   double elapsed_time_ms = (end_sec - _mark_cleanup_start_sec) * 1000.0;

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

@@ -1138,7 +1138,7 @@ class G1MergeHeapRootsTask : public WorkerTask {
       // Mark phase midway, which might have also left stale marks in old generation regions.
       // There might actually have been scheduled multiple collections, but at that point we do
       // not care that much about performance and just do the work multiple times if needed.
-      return (_g1h->collector_state()->clearing_bitmap() ||
+      return (_g1h->collector_state()->clear_bitmap_in_progress() ||
               _g1h->concurrent_mark_is_terminating()) &&
               hr->is_old();
     }