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

6420645: Create a vm that uses compressed oops for up to 32gb heapsizes

Browse source 
Compressed oops in instances, arrays, and headers. Code contributors are coleenp, phh, never, swamyv

Reviewed-by: jmasa, kamg, acorn, tbell, kvn, rasbold
This commit is contained in:
Coleen Phillimore 2008-04-13 17:43:42 -04:00
parent 680ecf1611
commit 4a831d45f0
273 changed files with 6585 additions and 2993 deletions
Download patch file Download diff file Expand all files Collapse all files

94
hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
View file

@ -36,16 +36,16 @@ PreservedMark* MarkSweep::_preserved_marks = NULL;
ReferenceProcessor* MarkSweep::_ref_processor = NULL;
#ifdef VALIDATE_MARK_SWEEP
GrowableArray<oop*>* MarkSweep::_root_refs_stack = NULL;
GrowableArray<void*>* MarkSweep::_root_refs_stack = NULL;
GrowableArray<oop> * MarkSweep::_live_oops = NULL;
GrowableArray<oop> * MarkSweep::_live_oops_moved_to = NULL;
GrowableArray<size_t>* MarkSweep::_live_oops_size = NULL;
size_t MarkSweep::_live_oops_index = 0;
size_t MarkSweep::_live_oops_index_at_perm = 0;
GrowableArray<oop*>* MarkSweep::_other_refs_stack = NULL;
GrowableArray<oop*>* MarkSweep::_adjusted_pointers = NULL;
bool MarkSweep::_pointer_tracking = false;
bool MarkSweep::_root_tracking = true;
GrowableArray<void*>* MarkSweep::_other_refs_stack = NULL;
GrowableArray<void*>* MarkSweep::_adjusted_pointers = NULL;
bool MarkSweep::_pointer_tracking = false;
bool MarkSweep::_root_tracking = true;
GrowableArray<HeapWord*>* MarkSweep::_cur_gc_live_oops = NULL;
GrowableArray<HeapWord*>* MarkSweep::_cur_gc_live_oops_moved_to = NULL;
@ -59,7 +59,6 @@ void MarkSweep::revisit_weak_klass_link(Klass* k) {
_revisit_klass_stack->push(k);
}
void MarkSweep::follow_weak_klass_links() {
// All klasses on the revisit stack are marked at this point.
// Update and follow all subklass, sibling and implementor links.
@ -69,44 +68,15 @@ void MarkSweep::follow_weak_klass_links() {
follow_stack();
}
MarkSweep::FollowRootClosure MarkSweep::follow_root_closure;
void MarkSweep::mark_and_follow(oop* p) {
assert(Universe::heap()->is_in_reserved(p),
"we should only be traversing objects here");
oop m = *p;
if (m != NULL && !m->mark()->is_marked()) {
mark_object(m);
m->follow_contents(); // Follow contents of the marked object
}
}
void MarkSweep::_mark_and_push(oop* p) {
// Push marked object, contents will be followed later
oop m = *p;
mark_object(m);
_marking_stack->push(m);
}
void MarkSweep::FollowRootClosure::do_oop(oop* p) { follow_root(p); }
void MarkSweep::FollowRootClosure::do_oop(narrowOop* p) { follow_root(p); }
MarkSweep::MarkAndPushClosure MarkSweep::mark_and_push_closure;
void MarkSweep::follow_root(oop* p) {
assert(!Universe::heap()->is_in_reserved(p),
"roots shouldn't be things within the heap");
#ifdef VALIDATE_MARK_SWEEP
if (ValidateMarkSweep) {
guarantee(!_root_refs_stack->contains(p), "should only be in here once");
_root_refs_stack->push(p);
}
#endif
oop m = *p;
if (m != NULL && !m->mark()->is_marked()) {
mark_object(m);
m->follow_contents(); // Follow contents of the marked object
}
follow_stack();
}
MarkSweep::FollowRootClosure MarkSweep::follow_root_closure;
void MarkSweep::MarkAndPushClosure::do_oop(oop* p) { mark_and_push(p); }
void MarkSweep::MarkAndPushClosure::do_oop(narrowOop* p) { mark_and_push(p); }
void MarkSweep::follow_stack() {
while (!_marking_stack->is_empty()) {
@ -118,6 +88,7 @@ void MarkSweep::follow_stack() {
MarkSweep::FollowStackClosure MarkSweep::follow_stack_closure;
void MarkSweep::FollowStackClosure::do_void() { follow_stack(); }
// We preserve the mark which should be replaced at the end and the location that it
// will go. Note that the object that this markOop belongs to isn't currently at that
@ -142,6 +113,9 @@ void MarkSweep::preserve_mark(oop obj, markOop mark) {
MarkSweep::AdjustPointerClosure MarkSweep::adjust_root_pointer_closure(true);
MarkSweep::AdjustPointerClosure MarkSweep::adjust_pointer_closure(false);
void MarkSweep::AdjustPointerClosure::do_oop(oop* p) { adjust_pointer(p, _is_root); }
void MarkSweep::AdjustPointerClosure::do_oop(narrowOop* p) { adjust_pointer(p, _is_root); }
void MarkSweep::adjust_marks() {
assert(_preserved_oop_stack == NULL ||
_preserved_oop_stack->length() == _preserved_mark_stack->length(),
@ -187,7 +161,7 @@ void MarkSweep::restore_marks() {
#ifdef VALIDATE_MARK_SWEEP
void MarkSweep::track_adjusted_pointer(oop* p, oop newobj, bool isroot) {
void MarkSweep::track_adjusted_pointer(void* p, bool isroot) {
if (!ValidateMarkSweep)
return;
@ -201,7 +175,7 @@ void MarkSweep::track_adjusted_pointer(oop* p, oop newobj, bool isroot) {
if (index != -1) {
int l = _root_refs_stack->length();
if (l > 0 && l - 1 != index) {
oop* last = _root_refs_stack->pop();
void* last = _root_refs_stack->pop();
assert(last != p, "should be different");
_root_refs_stack->at_put(index, last);
} else {
@ -211,19 +185,17 @@ void MarkSweep::track_adjusted_pointer(oop* p, oop newobj, bool isroot) {
}
}
void MarkSweep::check_adjust_pointer(oop* p) {
void MarkSweep::check_adjust_pointer(void* p) {
_adjusted_pointers->push(p);
}
class AdjusterTracker: public OopClosure {
public:
AdjusterTracker() {};
void do_oop(oop* o) { MarkSweep::check_adjust_pointer(o); }
AdjusterTracker() {}
void do_oop(oop* o) { MarkSweep::check_adjust_pointer(o); }
void do_oop(narrowOop* o) { MarkSweep::check_adjust_pointer(o); }
};
void MarkSweep::track_interior_pointers(oop obj) {
if (ValidateMarkSweep) {
_adjusted_pointers->clear();
@ -234,7 +206,6 @@ void MarkSweep::track_interior_pointers(oop obj) {
}
}
void MarkSweep::check_interior_pointers() {
if (ValidateMarkSweep) {
_pointer_tracking = false;
@ -242,7 +213,6 @@ void MarkSweep::check_interior_pointers() {
}
}
void MarkSweep::reset_live_oop_tracking(bool at_perm) {
if (ValidateMarkSweep) {
guarantee((size_t)_live_oops->length() == _live_oops_index, "should be at end of live oops");
@ -250,7 +220,6 @@ void MarkSweep::reset_live_oop_tracking(bool at_perm) {
}
}
void MarkSweep::register_live_oop(oop p, size_t size) {
if (ValidateMarkSweep) {
_live_oops->push(p);
@ -283,7 +252,6 @@ void MarkSweep::live_oop_moved_to(HeapWord* q, size_t size,
}
}
void MarkSweep::compaction_complete() {
if (RecordMarkSweepCompaction) {
GrowableArray<HeapWord*>* _tmp_live_oops = _cur_gc_live_oops;
@ -299,7 +267,6 @@ void MarkSweep::compaction_complete() {
}
}
void MarkSweep::print_new_location_of_heap_address(HeapWord* q) {
if (!RecordMarkSweepCompaction) {
tty->print_cr("Requires RecordMarkSweepCompaction to be enabled");
@ -318,7 +285,7 @@ void MarkSweep::print_new_location_of_heap_address(HeapWord* q) {
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(" Was in oop " PTR_FORMAT ", size " SIZE_FORMAT ", at offset " SIZE_FORMAT, old_oop, sz, offset);
tty->print_cr(" Now in oop " PTR_FORMAT ", actual address " PTR_FORMAT, new_oop, new_oop + offset);
return;
}
@ -328,23 +295,16 @@ void MarkSweep::print_new_location_of_heap_address(HeapWord* q) {
}
#endif //VALIDATE_MARK_SWEEP
MarkSweep::IsAliveClosure MarkSweep::is_alive;
MarkSweep::IsAliveClosure MarkSweep::is_alive;
void MarkSweep::KeepAliveClosure::do_oop(oop* p) {
#ifdef VALIDATE_MARK_SWEEP
if (ValidateMarkSweep) {
if (!Universe::heap()->is_in_reserved(p)) {
_root_refs_stack->push(p);
} else {
_other_refs_stack->push(p);
}
}
#endif
mark_and_push(p);
}
void MarkSweep::IsAliveClosure::do_object(oop p) { ShouldNotReachHere(); }
bool MarkSweep::IsAliveClosure::do_object_b(oop p) { return p->is_gc_marked(); }
MarkSweep::KeepAliveClosure MarkSweep::keep_alive;
void MarkSweep::KeepAliveClosure::do_oop(oop* p) { MarkSweep::KeepAliveClosure::do_oop_work(p); }
void MarkSweep::KeepAliveClosure::do_oop(narrowOop* p) { MarkSweep::KeepAliveClosure::do_oop_work(p); }
void marksweep_init() { /* empty */ }
#ifndef PRODUCT

88
hotspot/src/share/vm/gc_implementation/shared/markSweep.hpp
View file

@ -46,55 +46,59 @@ class ReferenceProcessor;
#define VALIDATE_MARK_SWEEP_ONLY(code)
#endif
// declared at end
class PreservedMark;
class MarkSweep : AllStatic {
//
// In line closure decls
// Inline closure decls
//
class FollowRootClosure: public OopsInGenClosure{
class FollowRootClosure: public OopsInGenClosure {
public:
void do_oop(oop* p) { follow_root(p); }
virtual void do_oop(oop* p);
virtual void do_oop(narrowOop* p);
virtual const bool do_nmethods() const { return true; }
};
class MarkAndPushClosure: public OopClosure {
public:
void do_oop(oop* p) { mark_and_push(p); }
virtual void do_oop(oop* p);
virtual void do_oop(narrowOop* p);
virtual const bool do_nmethods() const { return true; }
};
class FollowStackClosure: public VoidClosure {
public:
void do_void() { follow_stack(); }
virtual void do_void();
};
class AdjustPointerClosure: public OopsInGenClosure {
private:
bool _is_root;
public:
AdjustPointerClosure(bool is_root) : _is_root(is_root) {}
void do_oop(oop* p) { _adjust_pointer(p, _is_root); }
virtual void do_oop(oop* p);
virtual void do_oop(narrowOop* p);
};
// Used for java/lang/ref handling
class IsAliveClosure: public BoolObjectClosure {
public:
void do_object(oop p) { assert(false, "don't call"); }
bool do_object_b(oop p) { return p->is_gc_marked(); }
virtual void do_object(oop p);
virtual bool do_object_b(oop p);
};
class KeepAliveClosure: public OopClosure {
protected:
template <class T> void do_oop_work(T* p);
public:
void do_oop(oop* p);
virtual void do_oop(oop* p);
virtual void do_oop(narrowOop* p);
};
//
// Friend decls
//
friend class AdjustPointerClosure;
friend class KeepAliveClosure;
friend class VM_MarkSweep;
@ -120,14 +124,14 @@ class MarkSweep : AllStatic {
static ReferenceProcessor* _ref_processor;
#ifdef VALIDATE_MARK_SWEEP
static GrowableArray<oop*>* _root_refs_stack;
static GrowableArray<void*>* _root_refs_stack;
static GrowableArray<oop> * _live_oops;
static GrowableArray<oop> * _live_oops_moved_to;
static GrowableArray<size_t>* _live_oops_size;
static size_t _live_oops_index;
static size_t _live_oops_index_at_perm;
static GrowableArray<oop*>* _other_refs_stack;
static GrowableArray<oop*>* _adjusted_pointers;
static GrowableArray<void*>* _other_refs_stack;
static GrowableArray<void*>* _adjusted_pointers;
static bool _pointer_tracking;
static bool _root_tracking;
@ -146,9 +150,8 @@ class MarkSweep : AllStatic {
static GrowableArray<size_t>* _last_gc_live_oops_size;
#endif
// Non public closures
static IsAliveClosure is_alive;
static IsAliveClosure is_alive;
static KeepAliveClosure keep_alive;
// Class unloading. Update subklass/sibling/implementor links at end of marking phase.
@ -159,9 +162,9 @@ class MarkSweep : AllStatic {
public:
// Public closures
static FollowRootClosure follow_root_closure;
static MarkAndPushClosure mark_and_push_closure;
static FollowStackClosure follow_stack_closure;
static FollowRootClosure follow_root_closure;
static MarkAndPushClosure mark_and_push_closure;
static FollowStackClosure follow_stack_closure;
static AdjustPointerClosure adjust_root_pointer_closure;
static AdjustPointerClosure adjust_pointer_closure;
@ -170,39 +173,29 @@ class MarkSweep : AllStatic {
// Call backs for marking
static void mark_object(oop obj);
static void follow_root(oop* p); // Mark pointer and follow contents. Empty marking
// Mark pointer and follow contents. Empty marking stack afterwards.
template <class T> static inline void follow_root(T* p);
// Mark pointer and follow contents.
template <class T> static inline void mark_and_follow(T* p);
// Check mark and maybe push on marking stack
template <class T> static inline void mark_and_push(T* p);
// stack afterwards.
static void follow_stack(); // Empty marking stack.
static void mark_and_follow(oop* p); // Mark pointer and follow contents.
static void _mark_and_push(oop* p); // Mark pointer and push obj on
// marking stack.
static void preserve_mark(oop p, markOop mark);
// Save the mark word so it can be restored later
static void adjust_marks(); // Adjust the pointers in the preserved marks table
static void restore_marks(); // Restore the marks that we saved in preserve_mark
template <class T> static inline void adjust_pointer(T* p, bool isroot);
static void mark_and_push(oop* p) { // Check mark and maybe push on
// marking stack
// assert(Universe::is_reserved_heap((oop)p), "we should only be traversing objects here");
oop m = *p;
if (m != NULL && !m->mark()->is_marked()) {
_mark_and_push(p);
}
}
static void follow_stack(); // Empty marking stack.
static void preserve_mark(oop p, markOop mark); // Save the mark word so it can be restored later
static void adjust_marks(); // Adjust the pointers in the preserved marks table
static void restore_marks(); // Restore the marks that we saved in preserve_mark
static void _adjust_pointer(oop* p, bool isroot);
static void adjust_root_pointer(oop* p) { _adjust_pointer(p, true); }
static void adjust_pointer(oop* p) { _adjust_pointer(p, false); }
static void adjust_root_pointer(oop* p) { adjust_pointer(p, true); }
static void adjust_pointer(oop* p) { adjust_pointer(p, false); }
static void adjust_pointer(narrowOop* p) { adjust_pointer(p, false); }
#ifdef VALIDATE_MARK_SWEEP
static void track_adjusted_pointer(oop* p, oop newobj, bool isroot);
static void check_adjust_pointer(oop* p); // Adjust this pointer
static void track_adjusted_pointer(void* p, bool isroot);
static void check_adjust_pointer(void* p);
static void track_interior_pointers(oop obj);
static void check_interior_pointers();
@ -223,7 +216,6 @@ class MarkSweep : AllStatic {
static void revisit_weak_klass_link(Klass* k); // Update subklass/sibling/implementor links at end of marking.
};
class PreservedMark VALUE_OBJ_CLASS_SPEC {
private:
oop _obj;

100
hotspot/src/share/vm/gc_implementation/shared/markSweep.inline.hpp
View file

@ -22,32 +22,11 @@
*
*/
inline void MarkSweep::_adjust_pointer(oop* p, bool isroot) {
oop obj = *p;
VALIDATE_MARK_SWEEP_ONLY(oop saved_new_pointer = NULL);
if (obj != NULL) {
oop new_pointer = oop(obj->mark()->decode_pointer());
assert(new_pointer != NULL || // is forwarding ptr?
obj->mark() == markOopDesc::prototype() || // not gc marked?
(UseBiasedLocking && obj->mark()->has_bias_pattern()) || // not gc marked?
obj->is_shared(), // never forwarded?
"should contain a forwarding pointer");
if (new_pointer != NULL) {
*p = new_pointer;
assert(Universe::heap()->is_in_reserved(new_pointer),
"should be in object space");
VALIDATE_MARK_SWEEP_ONLY(saved_new_pointer = new_pointer);
}
}
VALIDATE_MARK_SWEEP_ONLY(track_adjusted_pointer(p, saved_new_pointer, isroot));
}
inline void MarkSweep::mark_object(oop obj) {
#ifndef SERIALGC
if (UseParallelOldGC && VerifyParallelOldWithMarkSweep) {
assert(PSParallelCompact::mark_bitmap()->is_marked(obj),
"Should be marked in the marking bitmap");
"Should be marked in the marking bitmap");
}
#endif // SERIALGC
@ -60,3 +39,80 @@ inline void MarkSweep::mark_object(oop obj) {
preserve_mark(obj, mark);
}
}
template <class T> inline void MarkSweep::follow_root(T* p) {
assert(!Universe::heap()->is_in_reserved(p),
"roots shouldn't be things within the heap");
#ifdef VALIDATE_MARK_SWEEP
if (ValidateMarkSweep) {
guarantee(!_root_refs_stack->contains(p), "should only be in here once");
_root_refs_stack->push(p);
}
#endif
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (!obj->mark()->is_marked()) {
mark_object(obj);
obj->follow_contents();
}
}
follow_stack();
}
template <class T> inline void MarkSweep::mark_and_follow(T* p) {
// assert(Universe::heap()->is_in_reserved(p), "should be in object space");
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (!obj->mark()->is_marked()) {
mark_object(obj);
obj->follow_contents();
}
}
}
template <class T> inline void MarkSweep::mark_and_push(T* p) {
// assert(Universe::heap()->is_in_reserved(p), "should be in object space");
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
if (!obj->mark()->is_marked()) {
mark_object(obj);
_marking_stack->push(obj);
}
}
}
template <class T> inline void MarkSweep::adjust_pointer(T* p, bool isroot) {
T heap_oop = oopDesc::load_heap_oop(p);
if (!oopDesc::is_null(heap_oop)) {
oop obj = oopDesc::decode_heap_oop_not_null(heap_oop);
oop new_obj = oop(obj->mark()->decode_pointer());
assert(new_obj != NULL || // is forwarding ptr?
obj->mark() == markOopDesc::prototype() || // not gc marked?
(UseBiasedLocking && obj->mark()->has_bias_pattern()) ||
// not gc marked?
obj->is_shared(), // never forwarded?
"should be forwarded");
if (new_obj != NULL) {
assert(Universe::heap()->is_in_reserved(new_obj),
"should be in object space");
oopDesc::encode_store_heap_oop_not_null(p, new_obj);
}
}
VALIDATE_MARK_SWEEP_ONLY(track_adjusted_pointer(p, isroot));
}
template <class T> inline void MarkSweep::KeepAliveClosure::do_oop_work(T* p) {
#ifdef VALIDATE_MARK_SWEEP
if (ValidateMarkSweep) {
if (!Universe::heap()->is_in_reserved(p)) {
_root_refs_stack->push(p);
} else {
_other_refs_stack->push(p);
}
}
#endif
mark_and_push(p);
}