Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Also register filler object for retired gclabs #74

Closed
wants to merge 1 commit into from
+15 −11
Closed

Also register filler object for retired gclabs #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View file
Original file line number Diff line number Diff line change
@@ -921,16 +921,20 @@ HeapWord* ShenandoahHeap::allocate_from_plab_slow(Thread* thread, size_t size) {
}

void ShenandoahHeap::retire_plab(PLAB* plab) {
size_t waste = plab->waste();
HeapWord* top = plab->top();
plab->retire();
if (top != NULL && plab->waste() > waste) {
// If retiring the plab created a filler object, then we
// need to register it with our card scanner so it can
// safely walk the region backing the plab.
log_debug(gc)("retire_plab() is registering remnant of size " SIZE_FORMAT " at " PTR_FORMAT,
plab->waste() - waste, p2i(top));
card_scan()->register_object_wo_lock(top);
if (!mode()->is_generational()) {
plab->retire();
} else {
size_t waste = plab->waste();
HeapWord* top = plab->top();
plab->retire();
if (top != NULL && plab->waste() > waste) {
// If retiring the plab created a filler object, then we
// need to register it with our card scanner so it can
// safely walk the region backing the plab.
log_debug(gc)("retire_plab() is registering remnant of size " SIZE_FORMAT " at " PTR_FORMAT,
plab->waste() - waste, p2i(top));
card_scan()->register_object_wo_lock(top);
}
}
}

@@ -1241,7 +1245,7 @@ class ShenandoahRetireGCLABClosure : public ThreadClosure {
void do_thread(Thread* thread) {
PLAB* gclab = ShenandoahThreadLocalData::gclab(thread);
assert(gclab != NULL, "GCLAB should be initialized for %s", thread->name());
gclab->retire();
ShenandoahHeap::heap()->retire_plab(gclab);
if (_resize && ShenandoahThreadLocalData::gclab_size(thread) > 0) {
ShenandoahThreadLocalData::set_gclab_size(thread, 0);
}