archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-15 13:49:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8365122: G1: Minor clean up of G1SurvivorRegions

Browse source 
Reviewed-by: sangheki, kbarrett
This commit is contained in:
Thomas Schatzl 2025-08-12 08:52:37 +00:00
parent 3c0eed8e47
commit 16e461ef31
3 changed files with 17 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/hotspot/share/gc/g1/g1Policy.cpp
View file

@ -508,12 +508,9 @@ uint G1Policy::calculate_desired_eden_length_before_mixed(double base_time_ms,
}
double G1Policy::predict_survivor_regions_evac_time() const {
const GrowableArray<G1HeapRegion*>* survivor_regions = _g1h->survivor()->regions();
double survivor_regions_evac_time = predict_young_region_other_time_ms(_g1h->survivor()->length());
for (GrowableArrayIterator<G1HeapRegion*> it = survivor_regions->begin();
it != survivor_regions->end();
++it) {
survivor_regions_evac_time += predict_region_copy_time_ms(*it, _g1h->collector_state()->in_young_only_phase());
for (G1HeapRegion* r : _g1h->survivor()->regions()) {
survivor_regions_evac_time += predict_region_copy_time_ms(r, _g1h->collector_state()->in_young_only_phase());
}
return survivor_regions_evac_time;
@ -1461,16 +1458,13 @@ uint G1Policy::calc_max_old_cset_length() const {
void G1Policy::transfer_survivors_to_cset(const G1SurvivorRegions* survivors) {
start_adding_survivor_regions();
for (GrowableArrayIterator<G1HeapRegion*> it = survivors->regions()->begin();
it != survivors->regions()->end();
++it) {
G1HeapRegion* curr = *it;
set_region_survivor(curr);
for (G1HeapRegion* r : survivors->regions()) {
set_region_survivor(r);
// The region is a non-empty survivor so let's add it to
// the incremental collection set for the next evacuation
// pause.
_collection_set->add_survivor_regions(curr);
_collection_set->add_survivor_regions(r);
}
stop_adding_survivor_regions();

15
src/hotspot/share/gc/g1/g1SurvivorRegions.cpp
View file

@ -28,18 +28,18 @@
#include "utilities/growableArray.hpp"
G1SurvivorRegions::G1SurvivorRegions() :
_regions(new (mtGC) GrowableArray<G1HeapRegion*>(8, mtGC)),
_regions(8, mtGC),
_used_bytes(0),
_regions_on_node() {}
uint G1SurvivorRegions::add(G1HeapRegion* hr) {
assert(hr->is_survivor(), "should be flagged as survivor region");
_regions->append(hr);
_regions.append(hr);
return _regions_on_node.add(hr);
}
uint G1SurvivorRegions::length() const {
return (uint)_regions->length();
return (uint)_regions.length();
}
uint G1SurvivorRegions::regions_on_node(uint node_index) const {
@ -47,17 +47,14 @@ uint G1SurvivorRegions::regions_on_node(uint node_index) const {
}
void G1SurvivorRegions::convert_to_eden() {
for (GrowableArrayIterator<G1HeapRegion*> it = _regions->begin();
it != _regions->end();
++it) {
G1HeapRegion* hr = *it;
hr->set_eden_pre_gc();
for (G1HeapRegion* r : _regions) {
r->set_eden_pre_gc();
}
clear();
}
void G1SurvivorRegions::clear() {
_regions->clear();
_regions.clear();
_used_bytes = 0;
_regions_on_node.clear();
}

11
src/hotspot/share/gc/g1/g1SurvivorRegions.hpp
View file

@ -27,16 +27,17 @@
#include "gc/g1/g1RegionsOnNodes.hpp"
#include "runtime/globals.hpp"
#include "utilities/growableArray.hpp"
template <typename T>
class GrowableArray;
class G1HeapRegion;
// Set of current survivor regions.
class G1SurvivorRegions {
private:
GrowableArray<G1HeapRegion*>* _regions;
volatile size_t _used_bytes;
G1RegionsOnNodes _regions_on_node;
GrowableArray<G1HeapRegion*> _regions;
volatile size_t _used_bytes;
G1RegionsOnNodes _regions_on_node;
public:
G1SurvivorRegions();
@ -50,7 +51,7 @@ public:
uint length() const;
uint regions_on_node(uint node_index) const;
const GrowableArray<G1HeapRegion*>* regions() const {
const GrowableArray<G1HeapRegion*>& regions() const {
return _regions;
}