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

7125281: G1: heap expansion code is replicated

Browse source 
Reviewed-by: brutisso, johnc
This commit is contained in:
Antonios Printezis 2012-01-09 23:50:41 -05:00
parent 90cdae9775
commit 30bfc8f549
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3793,6 +3793,8 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
size_t expand_bytes = g1_policy()->expansion_amount(); size_t expand_bytes = g1_policy()->expansion_amount();
if (expand_bytes > 0) { if (expand_bytes > 0) {
size_t bytes_before = capacity(); size_t bytes_before = capacity();
// No need for an ergo verbose message here,
// expansion_amount() does this when it returns a value > 0.
if (!expand(expand_bytes)) { if (!expand(expand_bytes)) {
// We failed to expand the heap so let's verify that // We failed to expand the heap so let's verify that
// committed/uncommitted amount match the backing store // committed/uncommitted amount match the backing store
@ -3849,21 +3851,6 @@ G1CollectedHeap::do_collection_pause_at_safepoint(double target_pause_time_ms) {
// CM reference discovery will be re-enabled if necessary. // CM reference discovery will be re-enabled if necessary.
} }
{
size_t expand_bytes = g1_policy()->expansion_amount();
if (expand_bytes > 0) {
size_t bytes_before = capacity();
// No need for an ergo verbose message here,
// expansion_amount() does this when it returns a value > 0.
if (!expand(expand_bytes)) {
// We failed to expand the heap so let's verify that
// committed/uncommitted amount match the backing store
assert(capacity() == _g1_storage.committed_size(), "committed size mismatch");
assert(max_capacity() == _g1_storage.reserved_size(), "reserved size mismatch");
}
}
}
// We should do this after we potentially expand the heap so // We should do this after we potentially expand the heap so
// that all the COMMIT events are generated before the end GC // that all the COMMIT events are generated before the end GC
// event, and after we retire the GC alloc regions so that all // event, and after we retire the GC alloc regions so that all