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

8225216: gc/logging/TestMetaSpaceLog.java doesn't work for Shenandoah

Browse source 
Reviewed-by: shade
This commit is contained in:
Kelvin Nilsen 2020-03-12 06:47:17 +01:00 • committed by Aleksey Shipilev
parent b0f32c4431
commit 19e02810db
3 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -178,6 +178,9 @@ void ShenandoahControlThread::run_service() {
if (gc_requested) {
heap->reset_bytes_allocated_since_gc_start();
// Use default constructor to snapshot the Metaspace state before GC.
metaspace::MetaspaceSizesSnapshot meta_sizes;
// If GC was requested, we are sampling the counters even without actual triggers
// from allocation machinery. This captures GC phases more accurately.
set_forced_counters_update(true);
@ -187,28 +190,24 @@ void ShenandoahControlThread::run_service() {
ShenandoahHeapLocker locker(heap->lock());
heap->free_set()->log_status();
}
}
switch (mode) {
case none:
break;
case concurrent_traversal:
service_concurrent_traversal_cycle(cause);
break;
case concurrent_normal:
service_concurrent_normal_cycle(cause);
break;
case stw_degenerated:
service_stw_degenerated_cycle(cause, degen_point);
break;
case stw_full:
service_stw_full_cycle(cause);
break;
default:
ShouldNotReachHere();
}
switch (mode) {
case concurrent_traversal:
service_concurrent_traversal_cycle(cause);
break;
case concurrent_normal:
service_concurrent_normal_cycle(cause);
break;
case stw_degenerated:
service_stw_degenerated_cycle(cause, degen_point);
break;
case stw_full:
service_stw_full_cycle(cause);
break;
default:
ShouldNotReachHere();
}
if (gc_requested) {
// If this was the requested GC cycle, notify waiters about it
if (explicit_gc_requested || implicit_gc_requested) {
notify_gc_waiters();
@ -244,6 +243,9 @@ void ShenandoahControlThread::run_service() {
heuristics->clear_metaspace_oom();
}
// Print Metaspace change following GC (if logging is enabled).
MetaspaceUtils::print_metaspace_change(meta_sizes);
// GC is over, we are at idle now
if (ShenandoahPacing) {
heap->pacer()->setup_for_idle();

1
test/hotspot/jtreg/TEST.groups
View file

@ -242,6 +242,7 @@ tier2_gc_shenandoah = \
gc/ergonomics/TestInitialGCThreadLogging.java \
gc/ergonomics/TestDynamicNumberOfGCThreads.java \
gc/logging/TestGCId.java \
gc/logging/TestMetaSpaceLog.java \
gc/metaspace/TestMetaspacePerfCounters.java \
gc/metaspace/TestMetaspacePerfCounters.java \
gc/startup_warnings/TestShenandoah.java \

1
test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java
View file

@ -45,7 +45,6 @@ import sun.hotspot.WhiteBox;
* java.management
* @requires vm.gc != "Epsilon"
* @requires vm.gc != "Z"
* @requires vm.gc != "Shenandoah"
*
* @compile TestMetaSpaceLog.java
* @run driver ClassFileInstaller sun.hotspot.WhiteBox