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

8130265: gctests/LargeObjects/large001 fails with OutOfMemoryError: Java heap space

Browse Source 
Avoided G1 OutOfMemoryError by adding extra expand heap call

Reviewed-by: jwilhelm, tschatzl
This commit is contained in:
Alexander Harlap 2015-09-30 18:09:40 -04:00
parent 003892f897
commit 786cdcb65d
2 changed files with 60 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp
View File

@ -1801,21 +1801,20 @@ resize_if_necessary_after_full_collection(size_t word_size) {
}
}
HeapWord*
G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
HeapWord* G1CollectedHeap::satisfy_failed_allocation_helper(size_t word_size,
AllocationContext_t context,
bool* succeeded) {
assert_at_safepoint(true /* should_be_vm_thread */);
*succeeded = true;
bool do_gc,
bool clear_all_soft_refs,
bool expect_null_mutator_alloc_region,
bool* gc_succeeded) {
*gc_succeeded = true;
// Let's attempt the allocation first.
HeapWord* result =
attempt_allocation_at_safepoint(word_size,
context,
false /* expect_null_mutator_alloc_region */);
expect_null_mutator_alloc_region);
if (result != NULL) {
assert(*succeeded, "sanity");
assert(*gc_succeeded, "sanity");
return result;
}
@ -1825,41 +1824,58 @@ G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
// do something smarter than full collection to satisfy a failed alloc.)
result = expand_and_allocate(word_size, context);
if (result != NULL) {
assert(*succeeded, "sanity");
assert(*gc_succeeded, "sanity");
return result;
}
if (do_gc) {
// Expansion didn't work, we'll try to do a Full GC.
bool gc_succeeded = do_collection(false, /* explicit_gc */
false, /* clear_all_soft_refs */
*gc_succeeded = do_collection(false, /* explicit_gc */
clear_all_soft_refs,
word_size);
if (!gc_succeeded) {
*succeeded = false;
return NULL;
}
// Retry the allocation
result = attempt_allocation_at_safepoint(word_size,
return NULL;
}
HeapWord* G1CollectedHeap::satisfy_failed_allocation(size_t word_size,
AllocationContext_t context,
bool* succeeded) {
assert_at_safepoint(true /* should_be_vm_thread */);
// Attempts to allocate followed by Full GC.
HeapWord* result =
satisfy_failed_allocation_helper(word_size,
context,
true /* expect_null_mutator_alloc_region */);
if (result != NULL) {
assert(*succeeded, "sanity");
true, /* do_gc */
false, /* clear_all_soft_refs */
false, /* expect_null_mutator_alloc_region */
succeeded);
if (result != NULL || !*succeeded) {
return result;
}
// Then, try a Full GC that will collect all soft references.
gc_succeeded = do_collection(false, /* explicit_gc */
// Attempts to allocate followed by Full GC that will collect all soft references.
result = satisfy_failed_allocation_helper(word_size,
context,
true, /* do_gc */
true, /* clear_all_soft_refs */
word_size);
if (!gc_succeeded) {
*succeeded = false;
return NULL;
true, /* expect_null_mutator_alloc_region */
succeeded);
if (result != NULL || !*succeeded) {
return result;
}
// Retry the allocation once more
result = attempt_allocation_at_safepoint(word_size,
// Attempts to allocate, no GC
result = satisfy_failed_allocation_helper(word_size,
context,
true /* expect_null_mutator_alloc_region */);
false, /* do_gc */
false, /* clear_all_soft_refs */
true, /* expect_null_mutator_alloc_region */
succeeded);
if (result != NULL) {
assert(*succeeded, "sanity");
return result;

9
hotspot/src/share/vm/gc/g1/g1CollectedHeap.hpp
View File

@ -571,7 +571,16 @@ protected:
HeapWord* satisfy_failed_allocation(size_t word_size,
AllocationContext_t context,
bool* succeeded);
private:
// Helper method for satisfy_failed_allocation()
HeapWord* satisfy_failed_allocation_helper(size_t word_size,
AllocationContext_t context,
bool do_gc,
bool clear_all_soft_refs,
bool expect_null_mutator_alloc_region,
bool* gc_succeeded);
protected:
// Attempting to expand the heap sufficiently
// to support an allocation of the given "word_size". If
// successful, perform the allocation and return the address of the