archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8243464: Shenandoah: print statistic counters in time order

Browse source 
Reviewed-by: rkennke
This commit is contained in:
Aleksey Shipilev 2020-04-23 13:48:23 +02:00
parent cbdb4ba7ca
commit fde66512df
4 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -354,7 +354,7 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
// Final mark might have reclaimed some immediate garbage, kick cleanup to reclaim // 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. // the space. This would be the last action if there is nothing to evacuate.
heap->entry_cleanup(); heap->entry_cleanup_early();
{ {
ShenandoahHeapLocker locker(heap->lock()); ShenandoahHeapLocker locker(heap->lock());
@ -389,7 +389,7 @@ void ShenandoahControlThread::service_concurrent_normal_cycle(GCCause::Cause cau
heap->vmop_entry_final_updaterefs(); heap->vmop_entry_final_updaterefs();
// Update references freed up collection set, kick the cleanup to reclaim the space. // Update references freed up collection set, kick the cleanup to reclaim the space.
heap->entry_cleanup(); heap->entry_cleanup_complete();
} }
// Cycle is complete // Cycle is complete

29
src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp
View file

@ -1630,7 +1630,11 @@ void ShenandoahHeap::op_updaterefs() {
update_heap_references(true); update_heap_references(true);
} }
void ShenandoahHeap::op_cleanup() { void ShenandoahHeap::op_cleanup_early() {
free_set()->recycle_trash();
}
void ShenandoahHeap::op_cleanup_complete() {
free_set()->recycle_trash(); free_set()->recycle_trash();
} }
@ -1950,7 +1954,7 @@ void ShenandoahHeap::op_degenerated(ShenandoahDegenPoint point) {
ShenandoahCodeRoots::disarm_nmethods(); ShenandoahCodeRoots::disarm_nmethods();
} }
op_cleanup(); op_cleanup_early();
case _degenerated_evac: case _degenerated_evac:
// If heuristics thinks we should do the cycle, this flag would be set, // If heuristics thinks we should do the cycle, this flag would be set,
@ -2013,7 +2017,7 @@ void ShenandoahHeap::op_degenerated(ShenandoahDegenPoint point) {
} }
} }
op_cleanup(); op_cleanup_complete();
break; break;
default: default:
@ -2921,17 +2925,30 @@ void ShenandoahHeap::entry_strong_roots() {
op_strong_roots(); op_strong_roots();
} }
void ShenandoahHeap::entry_cleanup() { void ShenandoahHeap::entry_cleanup_early() {
static const char* msg = "Concurrent cleanup"; static const char* msg = "Concurrent cleanup";
ShenandoahConcurrentPhase gc_phase(msg, true /* log_heap_usage */); ShenandoahConcurrentPhase gc_phase(msg, true /* log_heap_usage */);
EventMark em("%s", msg); EventMark em("%s", msg);
ShenandoahGCSubPhase phase(ShenandoahPhaseTimings::conc_cleanup); ShenandoahGCSubPhase phase(ShenandoahPhaseTimings::conc_cleanup_early);
// This phase does not use workers, no need for setup // This phase does not use workers, no need for setup
try_inject_alloc_failure(); try_inject_alloc_failure();
op_cleanup(); op_cleanup_early();
}
void ShenandoahHeap::entry_cleanup_complete() {
static const char* msg = "Concurrent cleanup";
ShenandoahConcurrentPhase gc_phase(msg, true /* log_heap_usage */);
EventMark em("%s", msg);
ShenandoahGCSubPhase phase(ShenandoahPhaseTimings::conc_cleanup_complete);
// This phase does not use workers, no need for setup
try_inject_alloc_failure();
op_cleanup_complete();
} }
void ShenandoahHeap::entry_reset() { void ShenandoahHeap::entry_reset() {

6
src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
View file

@ -400,9 +400,10 @@ public:
void entry_weak_roots(); void entry_weak_roots();
void entry_class_unloading(); void entry_class_unloading();
void entry_strong_roots(); void entry_strong_roots();
void entry_cleanup(); void entry_cleanup_early();
void entry_evac(); void entry_evac();
void entry_updaterefs(); void entry_updaterefs();
void entry_cleanup_complete();
void entry_uncommit(double shrink_before); void entry_uncommit(double shrink_before);
private: private:
@ -422,10 +423,11 @@ private:
void op_weak_roots(); void op_weak_roots();
void op_class_unloading(); void op_class_unloading();
void op_strong_roots(); void op_strong_roots();
void op_cleanup(); void op_cleanup_early();
void op_conc_evac(); void op_conc_evac();
void op_stw_evac(); void op_stw_evac();
void op_updaterefs(); void op_updaterefs();
void op_cleanup_complete();
void op_uncommit(double shrink_before); void op_uncommit(double shrink_before);
// Messages for GC trace events, they have to be immortal for // Messages for GC trace events, they have to be immortal for

26
src/hotspot/share/gc/shenandoah/shenandoahPhaseTimings.hpp
View file

@ -57,6 +57,8 @@ class outputStream;
// end // end
#define SHENANDOAH_GC_PHASE_DO(f) \ #define SHENANDOAH_GC_PHASE_DO(f) \
f(conc_reset, "Concurrent Reset") \
\
f(init_mark_gross, "Pause Init Mark (G)") \ f(init_mark_gross, "Pause Init Mark (G)") \
f(init_mark, "Pause Init Mark (N)") \ f(init_mark, "Pause Init Mark (N)") \
f(make_parsable, " Make Parsable") \ f(make_parsable, " Make Parsable") \
@ -65,6 +67,9 @@ class outputStream;
SHENANDOAH_GC_PAR_PHASE_DO(scan_, " S: ", f) \ SHENANDOAH_GC_PAR_PHASE_DO(scan_, " S: ", f) \
f(resize_tlabs, " Resize TLABs") \ f(resize_tlabs, " Resize TLABs") \
\ \
f(conc_mark, "Concurrent Marking") \
f(conc_preclean, "Concurrent Precleaning") \
\
f(final_mark_gross, "Pause Final Mark (G)") \ f(final_mark_gross, "Pause Final Mark (G)") \
f(final_mark, "Pause Final Mark (N)") \ f(final_mark, "Pause Final Mark (N)") \
f(update_roots, " Update Roots") \ f(update_roots, " Update Roots") \
@ -84,10 +89,18 @@ class outputStream;
f(init_evac, " Initial Evacuation") \ f(init_evac, " Initial Evacuation") \
SHENANDOAH_GC_PAR_PHASE_DO(evac_, " E: ", f) \ SHENANDOAH_GC_PAR_PHASE_DO(evac_, " E: ", f) \
\ \
f(conc_weak_roots, "Concurrent Weak Roots") \
f(conc_cleanup_early, "Concurrent Cleanup") \
f(conc_class_unloading, "Concurrent Class Unloading") \
f(conc_strong_roots, "Concurrent Strong Roots") \
f(conc_evac, "Concurrent Evacuation") \
\
f(init_update_refs_gross, "Pause Init Update Refs (G)") \ f(init_update_refs_gross, "Pause Init Update Refs (G)") \
f(init_update_refs, "Pause Init Update Refs (N)") \ f(init_update_refs, "Pause Init Update Refs (N)") \
f(init_update_refs_retire_gclabs, " Retire GCLABs") \ f(init_update_refs_retire_gclabs, " Retire GCLABs") \
\ \
f(conc_update_refs, "Concurrent Update Refs") \
\
f(final_update_refs_gross, "Pause Final Update Refs (G)") \ f(final_update_refs_gross, "Pause Final Update Refs (G)") \
f(final_update_refs, "Pause Final Update Refs (N)") \ f(final_update_refs, "Pause Final Update Refs (N)") \
f(final_update_refs_finish_work, " Finish Work") \ f(final_update_refs_finish_work, " Finish Work") \
@ -97,6 +110,8 @@ class outputStream;
f(final_update_refs_trash_cset, " Trash Collection Set") \ f(final_update_refs_trash_cset, " Trash Collection Set") \
f(final_update_refs_rebuild_freeset, " Rebuild Free Set") \ f(final_update_refs_rebuild_freeset, " Rebuild Free Set") \
\ \
f(conc_cleanup_complete, "Concurrent Cleanup") \
\
f(degen_gc_gross, "Pause Degenerated GC (G)") \ f(degen_gc_gross, "Pause Degenerated GC (G)") \
f(degen_gc, "Pause Degenerated GC (N)") \ f(degen_gc, "Pause Degenerated GC (N)") \
f(degen_gc_update_roots, " Degen Update Roots") \ f(degen_gc_update_roots, " Degen Update Roots") \
@ -128,17 +143,6 @@ class outputStream;
f(full_gc_copy_objects_rebuild, " Rebuild Region Sets") \ f(full_gc_copy_objects_rebuild, " Rebuild Region Sets") \
f(full_gc_resize_tlabs, " Resize TLABs") \ f(full_gc_resize_tlabs, " Resize TLABs") \
\ \
/* Longer concurrent phases at the end */ \
f(conc_reset, "Concurrent Reset") \
f(conc_mark, "Concurrent Marking") \
f(conc_preclean, "Concurrent Precleaning") \
f(conc_weak_roots, "Concurrent Weak Roots") \
f(conc_class_unloading, "Concurrent Class Unloading") \
f(conc_strong_roots, "Concurrent Strong Roots") \
f(conc_evac, "Concurrent Evacuation") \
f(conc_update_refs, "Concurrent Update Refs") \
f(conc_cleanup, "Concurrent Cleanup") \
\
f(conc_uncommit, "Concurrent Uncommit") \ f(conc_uncommit, "Concurrent Uncommit") \
\ \
/* Unclassified */ \ /* Unclassified */ \