Mercurial > hg > release > icedtea7-forest-2.5 > hotspot
changeset 2796:ae73da50be4b
7081064: G1: remove develop params G1FixedSurvivorSpaceSize, G1FixedTenuringThreshold, and G1FixedEdenSize
Summary: Remove three develop parameters we don't use.
Reviewed-by: brutisso, jwilhelm
| author | tonyp |
|---|---|
| date | Mon, 22 Aug 2011 10:16:33 -0400 |
| parents | ff53346271fe |
| children | be05e987ba07 |
| files | src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp src/share/vm/gc_implementation/g1/g1_globals.hpp |
| diffstat | 3 files changed, 5 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Fri Aug 19 09:30:59 2011 +0200 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp Mon Aug 22 10:16:33 2011 -0400 @@ -401,11 +401,9 @@ _concurrent_mark_remark_times_ms->add(0.05); _concurrent_mark_cleanup_times_ms->add(0.20); _tenuring_threshold = MaxTenuringThreshold; - - // if G1FixedSurvivorSpaceSize is 0 which means the size is not - // fixed, then _max_survivor_regions will be calculated at - // calculate_young_list_target_length during initialization - _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes; + // _max_survivor_regions will be calculated by + // calculate_young_list_target_length() during initialization. + _max_survivor_regions = 0; assert(GCTimeRatio > 0, "we should have set it to a default value set_g1_gc_flags() " @@ -2290,18 +2288,9 @@ // Calculates survivor space parameters. void G1CollectorPolicy::calculate_survivors_policy() { - if (G1FixedSurvivorSpaceSize == 0) { - _max_survivor_regions = _young_list_target_length / SurvivorRatio; - } else { - _max_survivor_regions = G1FixedSurvivorSpaceSize / HeapRegion::GrainBytes; - } - - if (G1FixedTenuringThreshold) { - _tenuring_threshold = MaxTenuringThreshold; - } else { - _tenuring_threshold = _survivors_age_table.compute_tenuring_threshold( + _max_survivor_regions = _young_list_target_length / SurvivorRatio; + _tenuring_threshold = _survivors_age_table.compute_tenuring_threshold( HeapRegion::GrainWords * _max_survivor_regions); - } } #ifndef PRODUCT
--- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Fri Aug 19 09:30:59 2011 +0200 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp Mon Aug 22 10:16:33 2011 -0400 @@ -1090,18 +1090,12 @@ bool is_young_list_full() { size_t young_list_length = _g1->young_list()->length(); size_t young_list_target_length = _young_list_target_length; - if (G1FixedEdenSize) { - young_list_target_length -= _max_survivor_regions; - } return young_list_length >= young_list_target_length; } bool can_expand_young_list() { size_t young_list_length = _g1->young_list()->length(); size_t young_list_max_length = _young_list_max_length; - if (G1FixedEdenSize) { - young_list_max_length -= _max_survivor_regions; - } return young_list_length < young_list_max_length; }
--- a/src/share/vm/gc_implementation/g1/g1_globals.hpp Fri Aug 19 09:30:59 2011 +0200 +++ b/src/share/vm/gc_implementation/g1/g1_globals.hpp Mon Aug 22 10:16:33 2011 -0400 @@ -249,16 +249,6 @@ "When set, G1 will fail when it encounters an FP 'error', " \ "so as to allow debugging") \ \ - develop(bool, G1FixedTenuringThreshold, false, \ - "When set, G1 will not adjust the tenuring threshold") \ - \ - develop(bool, G1FixedEdenSize, false, \ - "When set, G1 will not allocate unused survivor space regions") \ - \ - develop(uintx, G1FixedSurvivorSpaceSize, 0, \ - "If non-0 is the size of the G1 survivor space, " \ - "otherwise SurvivorRatio is used to determine the size") \ - \ product(uintx, G1HeapRegionSize, 0, \ "Size of the G1 regions.") \ \