archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 22:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7041440: G1: assert(obj->is_oop_or_null(true )) failed: Error #

Browse source 
During an evacuation pause clear the region fields of any concurrent marking task whose local finger points into the collection set as the values in the region fields will become stale. Clearing these fields causes the concurrent mark task to claim a new region when marking restarts after the pause.

Reviewed-by: tonyp, iveresov
This commit is contained in:
John Cuthbertson 2011-05-17 00:56:01 -07:00
parent 6819e3739e
commit 95548aa291
3 changed files with 48 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp
View file

@ -3054,6 +3054,28 @@ void ConcurrentMark::registerCSetRegion(HeapRegion* hr) {
_should_gray_objects = true;
}
// Resets the region fields of active CMTasks whose values point
// into the collection set.
void ConcurrentMark::reset_active_task_region_fields_in_cset() {
assert(SafepointSynchronize::is_at_safepoint(), "should be in STW");
assert(parallel_marking_threads() <= _max_task_num, "sanity");
for (int i = 0; i < (int)parallel_marking_threads(); i += 1) {
CMTask* task = _tasks[i];
HeapWord* task_finger = task->finger();
if (task_finger != NULL) {
assert(_g1h->is_in_g1_reserved(task_finger), "not in heap");
HeapRegion* finger_region = _g1h->heap_region_containing(task_finger);
if (finger_region->in_collection_set()) {
// The task's current region is in the collection set.
// This region will be evacuated in the current GC and
// the region fields in the task will be stale.
task->giveup_current_region();
}
}
}
}
// abandon current marking iteration due to a Full GC
void ConcurrentMark::abort() {
// Clear all marks to force marking thread to do nothing