test/lib/jdk/test/lib/jfr/GCHelper.java

@@ -33,10 +33,12 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
+import com.sun.management.HotSpotDiagnosticMXBean;
+import com.sun.management.VMOption;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;

@@ -169,16 +171,20 @@
     public static Map<String, String[]> requiredEvents = new HashMap<>();
 
     static {
         // young GarbageCollectionMXBeans.
         beanCollectorTypes.put("G1 Young Generation", true);
+        beanCollectorTypes.put("G1 Young", true);
         beanCollectorTypes.put("Copy", true);
         beanCollectorTypes.put("PS Scavenge", true);
         beanCollectorTypes.put("ParNew", true);
 
         // old GarbageCollectionMXBeans.
         beanCollectorTypes.put("G1 Old Generation", false);
+        beanCollectorTypes.put("G1 Mixed", false);
+        beanCollectorTypes.put("G1 Concurrent Cycle", false);
+        beanCollectorTypes.put("G1 Full", false);
         beanCollectorTypes.put("ConcurrentMarkSweep", false);
         beanCollectorTypes.put("PS MarkSweep", false);
         beanCollectorTypes.put("MarkSweepCompact", false);
 
         // List of expected collector overrides. "A.B" means that collector A may use collector B.