--- old/src/hotspot/share/gc/parallel/psOldGen.cpp 2020-05-11 12:37:07.383554191 -0400 +++ new/src/hotspot/share/gc/parallel/psOldGen.cpp 2020-05-11 12:37:06.987540966 -0400 @@ -40,15 +40,15 @@ PSOldGen::PSOldGen(ReservedSpace rs, size_t initial_size, size_t min_size, size_t max_size, const char* perf_data_name, int level): - _init_gen_size(initial_size), _min_gen_size(min_size), + _min_gen_size(min_size), _max_gen_size(max_size) { - initialize(rs, GenAlignment, perf_data_name, level); + initialize(rs, initial_size, GenAlignment, perf_data_name, level); } -void PSOldGen::initialize(ReservedSpace rs, size_t alignment, +void PSOldGen::initialize(ReservedSpace rs, size_t initial_size, size_t alignment, const char* perf_data_name, int level) { - initialize_virtual_space(rs, alignment); + initialize_virtual_space(rs, initial_size, alignment); initialize_work(perf_data_name, level); // The old gen can grow to max_gen_size(). _reserve reflects only @@ -58,7 +58,9 @@ initialize_performance_counters(perf_data_name, level); } -void PSOldGen::initialize_virtual_space(ReservedSpace rs, size_t alignment) { +void PSOldGen::initialize_virtual_space(ReservedSpace rs, + size_t initial_size, + size_t alignment) { if(ParallelArguments::is_heterogeneous_heap()) { _virtual_space = new PSFileBackedVirtualSpace(rs, alignment, AllocateOldGenAt); @@ -68,7 +70,7 @@ } else { _virtual_space = new PSVirtualSpace(rs, alignment); } - if (!_virtual_space->expand_by(_init_gen_size)) { + if (!_virtual_space->expand_by(initial_size)) { vm_exit_during_initialization("Could not reserve enough space for " "object heap"); } @@ -80,8 +82,8 @@ // MemRegion limit_reserved((HeapWord*)virtual_space()->low_boundary(), - heap_word_size(_max_gen_size)); - assert(limit_reserved.byte_size() == _max_gen_size, + heap_word_size(max_gen_size())); + assert(limit_reserved.byte_size() == max_gen_size(), "word vs bytes confusion"); // // Object start stuff @@ -137,8 +139,8 @@ void PSOldGen::initialize_performance_counters(const char* perf_data_name, int level) { // Generation Counters, generation 'level', 1 subspace - _gen_counters = new PSGenerationCounters(perf_data_name, level, 1, _min_gen_size, - _max_gen_size, virtual_space()); + _gen_counters = new PSGenerationCounters(perf_data_name, level, 1, min_gen_size(), + max_gen_size(), virtual_space()); _space_counters = new SpaceCounters(perf_data_name, 0, virtual_space()->reserved_size(), _object_space, _gen_counters); --- old/src/hotspot/share/gc/parallel/psOldGen.hpp 2020-05-11 12:37:08.547593066 -0400 +++ new/src/hotspot/share/gc/parallel/psOldGen.hpp 2020-05-11 12:37:08.147579706 -0400 @@ -49,7 +49,6 @@ SpaceCounters* _space_counters; // Sizing information, in bytes, set in constructor - const size_t _init_gen_size; const size_t _min_gen_size; const size_t _max_gen_size; @@ -110,9 +109,9 @@ void post_resize(); - void initialize(ReservedSpace rs, size_t alignment, + void initialize(ReservedSpace rs, size_t initial_size, size_t alignment, const char* perf_data_name, int level); - void initialize_virtual_space(ReservedSpace rs, size_t alignment); + void initialize_virtual_space(ReservedSpace rs, size_t initial_size, size_t alignment); void initialize_work(const char* perf_data_name, int level); void initialize_performance_counters(const char* perf_data_name, int level); --- old/src/hotspot/share/gc/parallel/psYoungGen.cpp 2020-05-11 12:37:09.699631540 -0400 +++ new/src/hotspot/share/gc/parallel/psYoungGen.cpp 2020-05-11 12:37:09.303618315 -0400 @@ -41,7 +41,6 @@ _eden_space(NULL), _from_space(NULL), _to_space(NULL), - _init_gen_size(initial_size), _min_gen_size(min_size), _max_gen_size(max_size), _gen_counters(NULL), @@ -49,20 +48,21 @@ _from_counters(NULL), _to_counters(NULL) { - initialize(rs, GenAlignment); + initialize(rs, initial_size, GenAlignment); } -void PSYoungGen::initialize_virtual_space(ReservedSpace rs, size_t alignment) { - assert(_init_gen_size != 0, "Should have a finite size"); +void PSYoungGen::initialize_virtual_space(ReservedSpace rs, + size_t initial_size, + size_t alignment) { + assert(initial_size != 0, "Should have a finite size"); _virtual_space = new PSVirtualSpace(rs, alignment); - if (!virtual_space()->expand_by(_init_gen_size)) { - vm_exit_during_initialization("Could not reserve enough space for " - "object heap"); + if (!virtual_space()->expand_by(initial_size)) { + vm_exit_during_initialization("Could not reserve enough space for object heap"); } } -void PSYoungGen::initialize(ReservedSpace rs, size_t alignment) { - initialize_virtual_space(rs, alignment); +void PSYoungGen::initialize(ReservedSpace rs, size_t initial_size, size_t alignment) { + initialize_virtual_space(rs, initial_size, alignment); initialize_work(); } @@ -92,8 +92,8 @@ _to_space = new MutableSpace(virtual_space()->alignment()); // Generation Counters - generation 0, 3 subspaces - _gen_counters = new PSGenerationCounters("new", 0, 3, _min_gen_size, - _max_gen_size, _virtual_space); + _gen_counters = new PSGenerationCounters("new", 0, 3, min_gen_size(), + max_gen_size(), virtual_space()); // Compute maximum space sizes for performance counters size_t alignment = SpaceAlignment; @@ -259,7 +259,7 @@ " used: " SIZE_FORMAT " capacity: " SIZE_FORMAT " gen limits: " SIZE_FORMAT " / " SIZE_FORMAT, eden_size, survivor_size, used_in_bytes(), capacity_in_bytes(), - _max_gen_size, min_gen_size()); + max_gen_size(), min_gen_size()); } } @@ -270,7 +270,7 @@ bool size_changed = false; // There used to be this guarantee there. - // guarantee ((eden_size + 2*survivor_size) <= _max_gen_size, "incorrect input arguments"); + // guarantee ((eden_size + 2*survivor_size) <= max_gen_size(), "incorrect input arguments"); // Code below forces this requirement. In addition the desired eden // size and desired survivor sizes are desired goals and may // exceed the total generation size. --- old/src/hotspot/share/gc/parallel/psYoungGen.hpp 2020-05-11 12:37:10.835669479 -0400 +++ new/src/hotspot/share/gc/parallel/psYoungGen.hpp 2020-05-11 12:37:10.435656121 -0400 @@ -46,7 +46,6 @@ MutableSpace* _to_space; // Sizing information, in bytes, set in constructor - const size_t _init_gen_size; const size_t _min_gen_size; const size_t _max_gen_size; @@ -78,9 +77,9 @@ // the location the live data in the generation. size_t available_to_live(); - void initialize(ReservedSpace rs, size_t alignment); + void initialize(ReservedSpace rs, size_t inital_size, size_t alignment); void initialize_work(); - void initialize_virtual_space(ReservedSpace rs, size_t alignment); + void initialize_virtual_space(ReservedSpace rs, size_t initial_size, size_t alignment); public: // Initialize the generation. --- old/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp 2020-05-11 12:37:12.015708890 -0400 +++ new/src/hotspot/share/gc/parallel/vmStructs_parallelgc.hpp 2020-05-11 12:37:11.619695663 -0400 @@ -56,14 +56,12 @@ nonstatic_field(PSYoungGen, _eden_space, MutableSpace*) \ nonstatic_field(PSYoungGen, _from_space, MutableSpace*) \ nonstatic_field(PSYoungGen, _to_space, MutableSpace*) \ - nonstatic_field(PSYoungGen, _init_gen_size, const size_t) \ nonstatic_field(PSYoungGen, _min_gen_size, const size_t) \ nonstatic_field(PSYoungGen, _max_gen_size, const size_t) \ \ nonstatic_field(PSOldGen, _reserved, MemRegion) \ nonstatic_field(PSOldGen, _virtual_space, PSVirtualSpace*) \ nonstatic_field(PSOldGen, _object_space, MutableSpace*) \ - nonstatic_field(PSOldGen, _init_gen_size, const size_t) \ nonstatic_field(PSOldGen, _min_gen_size, const size_t) \ nonstatic_field(PSOldGen, _max_gen_size, const size_t) \ \