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

6995045: assert(!gch->incremental_collection_failed()) failed: Error, defNewGeneration.cpp:827

Browse source 
Sharpened an assert, introduced in 6896603, that intended to check that the incremental_collection_failed() predicate on the heap was being reset "soon enough".

Reviewed-by: jmasa
This commit is contained in:
Y. Srinivas Ramakrishna 2010-10-28 14:46:29 -07:00
parent cbc7f8756a
commit 9333ab2399
1 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

21
hotspot/src/share/vm/memory/defNewGeneration.cpp
View file

@ -809,13 +809,16 @@ bool DefNewGeneration::collection_attempt_is_safe() {
}
void DefNewGeneration::gc_epilogue(bool full) {
DEBUG_ONLY(static bool seen_incremental_collection_failed = false;)
assert(!GC_locker::is_active(), "We should not be executing here");
// Check if the heap is approaching full after a collection has
// been done. Generally the young generation is empty at
// a minimum at the end of a collection. If it is not, then
// the heap is approaching full.
GenCollectedHeap* gch = GenCollectedHeap::heap();
if (full) {
assert(!GC_locker::is_active(), "We should not be executing here");
DEBUG_ONLY(seen_incremental_collection_failed = false;)
if (!collection_attempt_is_safe()) {
gch->set_incremental_collection_failed(); // Slight lie: a full gc left us in that state
set_should_allocate_from_space(); // we seem to be running out of space
@ -824,7 +827,21 @@ void DefNewGeneration::gc_epilogue(bool full) {
clear_should_allocate_from_space(); // if set
}
} else {
assert(!gch->incremental_collection_failed(), "Error");
#ifdef ASSERT
// It is possible that incremental_collection_failed() == true
// here, because an attempted scavenge did not succeed. The policy
// is normally expected to cause a full collection which should
// clear that condition, so we should not be here twice in a row
// with incremental_collection_failed() == true without having done
// a full collection in between.
if (!seen_incremental_collection_failed &&
gch->incremental_collection_failed()) {
seen_incremental_collection_failed = true;
} else if (seen_incremental_collection_failed) {
assert(!gch->incremental_collection_failed(), "Twice in a row");
seen_incremental_collection_failed = false;
}
#endif // ASSERT
}
if (ZapUnusedHeapArea) {