archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8216973: Kick up cleanup phases in the right places

Browse source 
Reviewed-by: shade
This commit is contained in:
Roman Kennke 2019-01-14 12:49:12 +01:00
parent ad67fe1baf
commit 2a932824aa
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/hotspot/share/gc/shenandoah/shenandoahControlThread.cpp
View file

@ -377,19 +377,19 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
// Complete marking under STW, and start evacuation
heap->vmop_entry_final_mark();
// Final mark might have reclaimed some immediate garbage, kick cleanup to reclaim
// the space. This would be the last action if there is nothing to evacuate.
heap->entry_cleanup();
{
ShenandoahHeapLocker locker(heap->lock());
heap->free_set()->log_status();
}
// Continue the cycle with evacuation and optional update-refs.
// This may be skipped if there is nothing to evacuate.
// If so, evac_in_progress would be unset by collection set preparation code.
if (heap->is_evacuation_in_progress()) {
// Final mark had reclaimed some immediate garbage, kick cleanup to reclaim the space
// for the rest of the cycle, and report current state of free set.
heap->entry_cleanup();
{
ShenandoahHeapLocker locker(heap->lock());
heap->free_set()->log_status();
}
// Concurrently evacuate
heap->entry_evac();
if (check_cancellation_or_degen(ShenandoahHeap::_degenerated_evac)) return;
@ -403,14 +403,15 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
if (check_cancellation_or_degen(ShenandoahHeap::_degenerated_updaterefs)) return;
heap->vmop_entry_final_updaterefs();
// Update references freed up collection set, kick the cleanup to reclaim the space.
heap->entry_cleanup();
} else {
heap->vmop_entry_final_evac();
}
}
// Reclaim space after cycle
heap->entry_cleanup();
// Cycle is complete
heap->heuristics()->record_success_concurrent();
heap->shenandoah_policy()->record_success_concurrent();