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

7013718: G1: small fixes for two assert/guarantee failures

Browse Source 
Two small fixes to deal with a guarantee failure (the marking thread should join the SuspendibleThreadSet before calling a method that does pause prediction work so that said method is never called during a pause) and an assert failure (an assert is too strong).

Reviewed-by: iveresov, johnc
This commit is contained in:
Antonios Printezis 2011-01-21 11:30:22 -05:00
parent d31ff8a886
commit 14f4450d25
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/share/vm/gc_implementation/g1/concurrentMarkThread.cpp
View File

@ -251,7 +251,9 @@ void ConcurrentMarkThread::run() {
// Now do the remainder of the cleanup operation. // Now do the remainder of the cleanup operation.
_cm->completeCleanup(); _cm->completeCleanup();
_sts.join();
g1_policy->record_concurrent_mark_cleanup_completed(); g1_policy->record_concurrent_mark_cleanup_completed();
_sts.leave();
double cleanup_end_sec = os::elapsedTime(); double cleanup_end_sec = os::elapsedTime();
if (PrintGC) { if (PrintGC) {

2
hotspot/src/share/vm/gc_implementation/g1/heapRegionSeq.cpp
View File

@ -195,10 +195,10 @@ int HeapRegionSeq::find_contiguous(size_t num) {
assert(0 <= res && res < _regions.length(), assert(0 <= res && res < _regions.length(),
err_msg("res: %d should be valid", res)); err_msg("res: %d should be valid", res));
_alloc_search_start = res + (int) num; _alloc_search_start = res + (int) num;
}
assert(0 < _alloc_search_start && _alloc_search_start <= _regions.length(), assert(0 < _alloc_search_start && _alloc_search_start <= _regions.length(),
err_msg("_alloc_search_start: %d should be valid", err_msg("_alloc_search_start: %d should be valid",
_alloc_search_start)); _alloc_search_start));
}
return res; return res;
} }