archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 11:34:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8025605: G1: Heap expansion logging misleading for fully expanded heap

Browse source 
Reviewed-by: tschatzl, jwilhelm, jmasa
This commit is contained in:
Bengt Rutisson 2013-10-01 07:52:52 +02:00
parent f144f37f49
commit ac3d344514
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
View file

@ -1772,7 +1772,6 @@ void G1CollectedHeap::update_committed_space(HeapWord* old_end,
} }
bool G1CollectedHeap::expand(size_t expand_bytes) { bool G1CollectedHeap::expand(size_t expand_bytes) {
size_t old_mem_size = _g1_storage.committed_size();
size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes); size_t aligned_expand_bytes = ReservedSpace::page_align_size_up(expand_bytes);
aligned_expand_bytes = align_size_up(aligned_expand_bytes, aligned_expand_bytes = align_size_up(aligned_expand_bytes,
HeapRegion::GrainBytes); HeapRegion::GrainBytes);
@ -1782,6 +1781,13 @@ bool G1CollectedHeap::expand(size_t expand_bytes) {
ergo_format_byte("attempted expansion amount"), ergo_format_byte("attempted expansion amount"),
expand_bytes, aligned_expand_bytes); expand_bytes, aligned_expand_bytes);
if (_g1_storage.uncommitted_size() == 0) {
ergo_verbose0(ErgoHeapSizing,
"did not expand the heap",
ergo_format_reason("heap already fully expanded"));
return false;
}
// First commit the memory. // First commit the memory.
HeapWord* old_end = (HeapWord*) _g1_storage.high(); HeapWord* old_end = (HeapWord*) _g1_storage.high();
bool successful = _g1_storage.expand_by(aligned_expand_bytes); bool successful = _g1_storage.expand_by(aligned_expand_bytes);
@ -1840,7 +1846,6 @@ bool G1CollectedHeap::expand(size_t expand_bytes) {
} }
void G1CollectedHeap::shrink_helper(size_t shrink_bytes) { void G1CollectedHeap::shrink_helper(size_t shrink_bytes) {
size_t old_mem_size = _g1_storage.committed_size();
size_t aligned_shrink_bytes = size_t aligned_shrink_bytes =
ReservedSpace::page_align_size_down(shrink_bytes); ReservedSpace::page_align_size_down(shrink_bytes);
aligned_shrink_bytes = align_size_down(aligned_shrink_bytes, aligned_shrink_bytes = align_size_down(aligned_shrink_bytes,