stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8028093: Initial young size is smaller than minimum young size

Browse Source 
Remove min_gen1_size argument from adjust_gen0_sizes()

Reviewed-by: tschatzl, brutisso
This commit is contained in:
Jesper Wilhelmsson 2013-11-11 13:50:10 +01:00
parent 2ec0e87f43
commit c6da83319b
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hotspot/src/share/vm/memory/collectorPolicy.cpp
View File

@ -523,17 +523,15 @@ void GenCollectorPolicy::initialize_size_info() {
// keeping it simple also seems a worthwhile goal. // keeping it simple also seems a worthwhile goal.
bool TwoGenerationCollectorPolicy::adjust_gen0_sizes(size_t* gen0_size_ptr, bool TwoGenerationCollectorPolicy::adjust_gen0_sizes(size_t* gen0_size_ptr,
size_t* gen1_size_ptr, size_t* gen1_size_ptr,
const size_t heap_size, const size_t heap_size) {
const size_t min_gen1_size) {
bool result = false; bool result = false;
if ((*gen1_size_ptr + *gen0_size_ptr) > heap_size) { if ((*gen0_size_ptr + *gen1_size_ptr) > heap_size) {
uintx smallest_new_size = young_gen_size_lower_bound(); uintx smallest_new_size = young_gen_size_lower_bound();
if ((heap_size < (*gen0_size_ptr + min_gen1_size)) && if ((heap_size < (*gen0_size_ptr + _min_gen1_size)) &&
(heap_size >= min_gen1_size + smallest_new_size)) { (heap_size >= _min_gen1_size + smallest_new_size)) {
// Adjust gen0 down to accommodate min_gen1_size // Adjust gen0 down to accommodate _min_gen1_size
*gen0_size_ptr = align_size_down_bounded(heap_size - min_gen1_size, _gen_alignment); *gen0_size_ptr = align_size_down_bounded(heap_size - _min_gen1_size, _gen_alignment);
assert(*gen0_size_ptr > 0, "Min gen0 is too large");
result = true; result = true;
} else { } else {
*gen1_size_ptr = align_size_down_bounded(heap_size - *gen0_size_ptr, _gen_alignment); *gen1_size_ptr = align_size_down_bounded(heap_size - *gen0_size_ptr, _gen_alignment);
@ -594,8 +592,7 @@ void TwoGenerationCollectorPolicy::initialize_size_info() {
} }
// If there is an inconsistency between the OldSize and the minimum and/or // If there is an inconsistency between the OldSize and the minimum and/or
// initial size of gen0, since OldSize was explicitly set, OldSize wins. // initial size of gen0, since OldSize was explicitly set, OldSize wins.
if (adjust_gen0_sizes(&_min_gen0_size, &_min_gen1_size, if (adjust_gen0_sizes(&_min_gen0_size, &_min_gen1_size, _min_heap_byte_size)) {
_min_heap_byte_size, _min_gen1_size)) {
if (PrintGCDetails && Verbose) { if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr("2: Minimum gen0 " SIZE_FORMAT " Initial gen0 " gclog_or_tty->print_cr("2: Minimum gen0 " SIZE_FORMAT " Initial gen0 "
SIZE_FORMAT " Maximum gen0 " SIZE_FORMAT, SIZE_FORMAT " Maximum gen0 " SIZE_FORMAT,
@ -604,7 +601,7 @@ void TwoGenerationCollectorPolicy::initialize_size_info() {
} }
// Initial size // Initial size
if (adjust_gen0_sizes(&_initial_gen0_size, &_initial_gen1_size, if (adjust_gen0_sizes(&_initial_gen0_size, &_initial_gen1_size,
_initial_heap_byte_size, _initial_gen1_size)) { _initial_heap_byte_size)) {
if (PrintGCDetails && Verbose) { if (PrintGCDetails && Verbose) {
gclog_or_tty->print_cr("3: Minimum gen0 " SIZE_FORMAT " Initial gen0 " gclog_or_tty->print_cr("3: Minimum gen0 " SIZE_FORMAT " Initial gen0 "
SIZE_FORMAT " Maximum gen0 " SIZE_FORMAT, SIZE_FORMAT " Maximum gen0 " SIZE_FORMAT,

4
hotspot/src/share/vm/memory/collectorPolicy.hpp
View File

@ -336,9 +336,9 @@ class TwoGenerationCollectorPolicy : public GenCollectorPolicy {
return CollectorPolicy::TwoGenerationCollectorPolicyKind; return CollectorPolicy::TwoGenerationCollectorPolicyKind;
} }
// Returns true is gen0 sizes were adjusted // Returns true if gen0 sizes were adjusted
bool adjust_gen0_sizes(size_t* gen0_size_ptr, size_t* gen1_size_ptr, bool adjust_gen0_sizes(size_t* gen0_size_ptr, size_t* gen1_size_ptr,
const size_t heap_size, const size_t min_gen1_size); const size_t heap_size);
}; };
class MarkSweepPolicy : public TwoGenerationCollectorPolicy { class MarkSweepPolicy : public TwoGenerationCollectorPolicy {