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

8004132: SerialGC: ValidateMarkSweep broken when running GCOld

Browse source 
Remove bit-rotten ValidateMarkSweep functionality and flag.

Reviewed-by: johnc, jmasa
This commit is contained in:
Tao Mao 2013-01-02 11:32:41 -08:00 • committed by John Cuthbertson
parent 86dd796322
commit 7cb614b0e5
13 changed files with 1 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

164
hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
View file

@ -99,25 +99,6 @@ double PSParallelCompact::_dwl_adjustment;
bool PSParallelCompact::_dwl_initialized = false;
#endif // #ifdef ASSERT
#ifdef VALIDATE_MARK_SWEEP
GrowableArray<void*>* PSParallelCompact::_root_refs_stack = NULL;
GrowableArray<oop> * PSParallelCompact::_live_oops = NULL;
GrowableArray<oop> * PSParallelCompact::_live_oops_moved_to = NULL;
GrowableArray<size_t>* PSParallelCompact::_live_oops_size = NULL;
size_t PSParallelCompact::_live_oops_index = 0;
GrowableArray<void*>* PSParallelCompact::_other_refs_stack = NULL;
GrowableArray<void*>* PSParallelCompact::_adjusted_pointers = NULL;
bool PSParallelCompact::_pointer_tracking = false;
bool PSParallelCompact::_root_tracking = true;
GrowableArray<HeapWord*>* PSParallelCompact::_cur_gc_live_oops = NULL;
GrowableArray<HeapWord*>* PSParallelCompact::_cur_gc_live_oops_moved_to = NULL;
GrowableArray<size_t> * PSParallelCompact::_cur_gc_live_oops_size = NULL;
GrowableArray<HeapWord*>* PSParallelCompact::_last_gc_live_oops = NULL;
GrowableArray<HeapWord*>* PSParallelCompact::_last_gc_live_oops_moved_to = NULL;
GrowableArray<size_t> * PSParallelCompact::_last_gc_live_oops_size = NULL;
#endif
void SplitInfo::record(size_t src_region_idx, size_t partial_obj_size,
HeapWord* destination)
{
@ -2715,151 +2696,6 @@ void PSParallelCompact::verify_complete(SpaceId space_id) {
}
#endif // #ifdef ASSERT
#ifdef VALIDATE_MARK_SWEEP
void PSParallelCompact::track_adjusted_pointer(void* p, bool isroot) {
if (!ValidateMarkSweep)
return;
if (!isroot) {
if (_pointer_tracking) {
guarantee(_adjusted_pointers->contains(p), "should have seen this pointer");
_adjusted_pointers->remove(p);
}
} else {
ptrdiff_t index = _root_refs_stack->find(p);
if (index != -1) {
int l = _root_refs_stack->length();
if (l > 0 && l - 1 != index) {
void* last = _root_refs_stack->pop();
assert(last != p, "should be different");
_root_refs_stack->at_put(index, last);
} else {
_root_refs_stack->remove(p);
}
}
}
}
void PSParallelCompact::check_adjust_pointer(void* p) {
_adjusted_pointers->push(p);
}
class AdjusterTracker: public OopClosure {
public:
AdjusterTracker() {};
void do_oop(oop* o) { PSParallelCompact::check_adjust_pointer(o); }
void do_oop(narrowOop* o) { PSParallelCompact::check_adjust_pointer(o); }
};
void PSParallelCompact::track_interior_pointers(oop obj) {
if (ValidateMarkSweep) {
_adjusted_pointers->clear();
_pointer_tracking = true;
AdjusterTracker checker;
obj->oop_iterate_no_header(&checker);
}
}
void PSParallelCompact::check_interior_pointers() {
if (ValidateMarkSweep) {
_pointer_tracking = false;
guarantee(_adjusted_pointers->length() == 0, "should have processed the same pointers");
}
}
void PSParallelCompact::reset_live_oop_tracking() {
if (ValidateMarkSweep) {
guarantee((size_t)_live_oops->length() == _live_oops_index, "should be at end of live oops");
_live_oops_index = 0;
}
}
void PSParallelCompact::register_live_oop(oop p, size_t size) {
if (ValidateMarkSweep) {
_live_oops->push(p);
_live_oops_size->push(size);
_live_oops_index++;
}
}
void PSParallelCompact::validate_live_oop(oop p, size_t size) {
if (ValidateMarkSweep) {
oop obj = _live_oops->at((int)_live_oops_index);
guarantee(obj == p, "should be the same object");
guarantee(_live_oops_size->at((int)_live_oops_index) == size, "should be the same size");
_live_oops_index++;
}
}
void PSParallelCompact::live_oop_moved_to(HeapWord* q, size_t size,
HeapWord* compaction_top) {
assert(oop(q)->forwardee() == NULL || oop(q)->forwardee() == oop(compaction_top),
"should be moved to forwarded location");
if (ValidateMarkSweep) {
PSParallelCompact::validate_live_oop(oop(q), size);
_live_oops_moved_to->push(oop(compaction_top));
}
if (RecordMarkSweepCompaction) {
_cur_gc_live_oops->push(q);
_cur_gc_live_oops_moved_to->push(compaction_top);
_cur_gc_live_oops_size->push(size);
}
}
void PSParallelCompact::compaction_complete() {
if (RecordMarkSweepCompaction) {
GrowableArray<HeapWord*>* _tmp_live_oops = _cur_gc_live_oops;
GrowableArray<HeapWord*>* _tmp_live_oops_moved_to = _cur_gc_live_oops_moved_to;
GrowableArray<size_t> * _tmp_live_oops_size = _cur_gc_live_oops_size;
_cur_gc_live_oops = _last_gc_live_oops;
_cur_gc_live_oops_moved_to = _last_gc_live_oops_moved_to;
_cur_gc_live_oops_size = _last_gc_live_oops_size;
_last_gc_live_oops = _tmp_live_oops;
_last_gc_live_oops_moved_to = _tmp_live_oops_moved_to;
_last_gc_live_oops_size = _tmp_live_oops_size;
}
}
void PSParallelCompact::print_new_location_of_heap_address(HeapWord* q) {
if (!RecordMarkSweepCompaction) {
tty->print_cr("Requires RecordMarkSweepCompaction to be enabled");
return;
}
if (_last_gc_live_oops == NULL) {
tty->print_cr("No compaction information gathered yet");
return;
}
for (int i = 0; i < _last_gc_live_oops->length(); i++) {
HeapWord* old_oop = _last_gc_live_oops->at(i);
size_t sz = _last_gc_live_oops_size->at(i);
if (old_oop <= q && q < (old_oop + sz)) {
HeapWord* new_oop = _last_gc_live_oops_moved_to->at(i);
size_t offset = (q - old_oop);
tty->print_cr("Address " PTR_FORMAT, q);
tty->print_cr(" Was in oop " PTR_FORMAT ", size %d, at offset %d", old_oop, sz, offset);
tty->print_cr(" Now in oop " PTR_FORMAT ", actual address " PTR_FORMAT, new_oop, new_oop + offset);
return;
}
}
tty->print_cr("Address " PTR_FORMAT " not found in live oop information from last GC", q);
}
#endif //VALIDATE_MARK_SWEEP
// Update interior oops in the ranges of regions [beg_region, end_region).
void
PSParallelCompact::update_and_deadwood_in_dense_prefix(ParCompactionManager* cm,