Sun, 08 Dec 2019 22:40:44 +0000
Merge
1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Wed Dec 04 16:24:15 2019 +0000 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Sun Dec 08 22:40:44 2019 +0000 1.3 @@ -376,7 +376,7 @@ 1.4 MAX2((uint) (MaxNewSize / HeapRegion::GrainBytes), 1.5 1U); 1.6 _sizer_kind = SizerMaxAndNewSize; 1.7 - _adaptive_size = _min_desired_young_length == _max_desired_young_length; 1.8 + _adaptive_size = _min_desired_young_length != _max_desired_young_length; 1.9 } else { 1.10 _sizer_kind = SizerNewSizeOnly; 1.11 }
2.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Wed Dec 04 16:24:15 2019 +0000 2.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Sun Dec 08 22:40:44 2019 +0000 2.3 @@ -133,7 +133,11 @@ 2.4 SizerKind _sizer_kind; 2.5 uint _min_desired_young_length; 2.6 uint _max_desired_young_length; 2.7 + 2.8 + // False when using a fixed young generation size due to command-line options, 2.9 + // true otherwise. 2.10 bool _adaptive_size; 2.11 + 2.12 uint calculate_default_min_length(uint new_number_of_heap_regions); 2.13 uint calculate_default_max_length(uint new_number_of_heap_regions); 2.14