infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-22 08:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Y. Srinivas Ramakrishna 2011-08-22 23:57:10 -07:00
commit 4df87be52f
3 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp
View File

@ -401,11 +401,9 @@ G1CollectorPolicy::G1CollectorPolicy() :
_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 @@ void G1CollectorPolicy::calculate_max_gc_locker_expansion() {
// 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

6
hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.hpp
View File

@ -1090,18 +1090,12 @@ public:
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;
}

10
hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp
View File

@ -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.") \
\