Update test, remove unused header, use proper case for old gen phases

earthling-amzn · Nov 18, 2024 · df0748f · df0748f
1 parent 1c7752c
commit df0748f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp b/src/hotspot/share/gc/shenandoah/shenandoahConcurrentGC.cpp
@@ -360,7 +360,7 @@ void ShenandoahConcurrentGC::entry_reset() {
   }
 
   if (_do_old_gc_bootstrap) {
-    static const char* msg = "Concurrent reset (OLD)";
+    static const char* msg = "Concurrent reset (Old)";
     ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_reset_old);
     ShenandoahWorkerScope scope(ShenandoahHeap::heap()->workers(),
                                 ShenandoahWorkerPolicy::calc_workers_for_conc_reset(),

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp b/src/hotspot/share/gc/shenandoah/shenandoahHeap.hpp
@@ -30,7 +30,6 @@
 #include "gc/shared/markBitMap.hpp"
 #include "gc/shared/softRefPolicy.hpp"
 #include "gc/shared/collectedHeap.hpp"
-#include "gc/shenandoah/heuristics/shenandoahSpaceInfo.hpp"
 #include "gc/shenandoah/shenandoahAllocRequest.hpp"
 #include "gc/shenandoah/shenandoahAsserts.hpp"
 #include "gc/shenandoah/shenandoahController.hpp"

diff --git a/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp b/src/hotspot/share/gc/shenandoah/shenandoahOldGeneration.cpp
@@ -378,7 +378,7 @@ void ShenandoahOldGeneration::prepare_gc() {
 bool ShenandoahOldGeneration::entry_coalesce_and_fill() {
   ShenandoahHeap* const heap = ShenandoahHeap::heap();
 
-  static const char* msg = "Coalescing and filling (OLD)";
+  static const char* msg = "Coalescing and filling (Old)";
   ShenandoahConcurrentPhase gc_phase(msg, ShenandoahPhaseTimings::conc_coalesce_and_fill);
 
   TraceCollectorStats tcs(heap->monitoring_support()->concurrent_collection_counters());

diff --git a/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java b/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java
@@ -47,10 +47,10 @@ public static void testWith(String msg, boolean periodic, String... args) throws
 
         output.shouldHaveExitValue(0);
         if (periodic) {
-            output.shouldContain("Trigger (GLOBAL): Time since last GC");
+            output.shouldContain("Trigger: Time since last GC");
         }
         if (!periodic) {
-            output.shouldNotContain("Trigger (GLOBAL): Time since last GC");
+            output.shouldNotContain("Trigger: Time since last GC");
         }
     }
 
@@ -63,11 +63,11 @@ public static void testGenerational(boolean periodic, String... args) throws Exc
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
         if (periodic) {
-            output.shouldContain("Trigger (YOUNG): Time since last GC");
-            output.shouldContain("Trigger (OLD): Time since last GC");
+            output.shouldContain("Trigger: Time since last GC");
+            output.shouldContain("Concurrent reset (Young)");
+            output.shouldContain("Concurrent reset (Old)");
         } else {
-            output.shouldNotContain("Trigger (YOUNG): Time since last GC");
-            output.shouldNotContain("Trigger (OLD): Time since last GC");
+            output.shouldNotContain("Trigger: Time since last GC");
         }
     }