JFR-related fixes for JDK21 (GR-45303)

Author: christianhaeubl

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JDKContainerSubstitutions.java

@@ -27,6 +27,7 @@
 
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import org.graalvm.nativeimage.Platform.LINUX;
@@ -66,7 +67,7 @@ final class Target_jdk_jfr_internal_instrument_JDKEvents {
     private static boolean initializationTriggered;
 }
 
-@TargetClass(className = "jdk.jfr.internal.RequestEngine", onlyWith = JDK17OrLater.class)
+@TargetClass(className = "jdk.jfr.internal.RequestEngine", onlyWith = {JDK17OrLater.class, JDK20OrEarlier.class})
 @Platforms(LINUX.class)
 final class Target_jdk_jfr_internal_RequestEngine {
     @Alias //
@@ -79,6 +80,15 @@ final class Target_jdk_jfr_internal_RequestEngine {
     private static List<?> entries;
 }
 
+@TargetClass(className = "jdk.jfr.internal.periodic.JVMEventTask", onlyWith = JDK21OrLater.class)
+@Platforms(LINUX.class)
+final class Target_jdk_jfr_internal_JVMEventTask {
+    @Alias //
+    @RecomputeFieldValue(kind = Kind.NewInstance, declClass = ReentrantLock.class) //
+    private static Lock lock;
+
+}
+
 // Only present in JDKs without JDK-8268398
 @TargetClass(className = "jdk.jfr.internal.Utils", onlyWith = {JDK17OrEarlier.class, JDK17OrLater.class})
 @Platforms(LINUX.class)

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrMetadataTypeLibrary.java

@@ -37,6 +37,7 @@
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 
+import jdk.jfr.internal.MetadataRepository;
 import jdk.jfr.internal.PlatformEventType;
 import jdk.jfr.internal.Type;
 import jdk.jfr.internal.TypeLibrary;
@@ -62,6 +63,12 @@ private static synchronized HashMap<String, Type> getTypes() {
     @SuppressWarnings("unchecked")
     private static Collection<Type> getTypes0() {
         try {
+            /*
+             * Initialize the MetadataRepository class, to ensure that large parts of the JFR
+             * infrastructure are initialized (e.g., the TypeLibrary that we access below).
+             */
+            MetadataRepository.getInstance();
+
             Method getTypes = ReflectionUtil.lookupMethod(TypeLibrary.class, "getTypes");
             if (JavaVersionUtil.JAVA_SPEC >= 21) {
                 return (Collection<Type>) getTypes.invoke(null);

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogConfiguration.java

@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
@@ -44,15 +43,15 @@
  * Parses the flight recorder logging configuration and enables the logging according to that
  * configuration.
  */
-class JfrLogConfiguration {
+final class JfrLogConfiguration {
     private static final String EMPTY_STRING_DEFAULT_CONFIG = "all=info";
     static final Map<LogTag, Set<JfrLogTag>> LOG_TAG_SETS = createLogTagSets();
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    JfrLogConfiguration() {
+    private JfrLogConfiguration() {
     }
 
-    void parse(String str) {
+    static void parse(String str) {
         if (str.equalsIgnoreCase("disable")) {
             return;
         }
@@ -98,34 +97,18 @@ private static void verifySelections(JfrLogSelection[] selections) {
         }
     }
 
+    @Platforms(Platform.HOSTED_ONLY.class)
     private static Map<LogTag, Set<JfrLogTag>> createLogTagSets() {
         Map<LogTag, Set<JfrLogTag>> result = new EnumMap<>(LogTag.class);
-        result.put(LogTag.JFR, EnumSet.of(JfrLogTag.JFR));
-        result.put(LogTag.JFR_SYSTEM, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM));
-        result.put(LogTag.JFR_SYSTEM_EVENT, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.EVENT));
-        result.put(LogTag.JFR_SYSTEM_SETTING, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.SETTING));
-        result.put(LogTag.JFR_SYSTEM_BYTECODE, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.BYTECODE));
-        result.put(LogTag.JFR_SYSTEM_PARSER, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.PARSER));
-        result.put(LogTag.JFR_SYSTEM_METADATA, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.METADATA));
-        result.put(LogTag.JFR_METADATA, EnumSet.of(JfrLogTag.JFR, JfrLogTag.METADATA));
-        result.put(LogTag.JFR_EVENT, EnumSet.of(JfrLogTag.JFR, JfrLogTag.EVENT));
-        result.put(LogTag.JFR_SETTING, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SETTING));
-        result.put(LogTag.JFR_DCMD, EnumSet.of(JfrLogTag.JFR, JfrLogTag.DCMD));
-
-        // JDK17 support
-        if (JavaVersionUtil.JAVA_SPEC >= 17) {
-            try {
-                LogTag jfrSystemStreaming = Enum.valueOf(LogTag.class, "JFR_SYSTEM_STREAMING");
-                LogTag jfrSystemThrottle = Enum.valueOf(LogTag.class, "JFR_SYSTEM_THROTTLE");
-                result.put(jfrSystemStreaming, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.STREAMING));
-                result.put(jfrSystemThrottle, EnumSet.of(JfrLogTag.JFR, JfrLogTag.SYSTEM, JfrLogTag.THROTTLE));
-                LogTag jfrStart = Enum.valueOf(LogTag.class, "JFR_START");
-                result.put(jfrStart, EnumSet.of(JfrLogTag.JFR, JfrLogTag.START));
-            } catch (IllegalArgumentException | NullPointerException e) {
-                throw VMError.shouldNotReachHere("Should be defined", e);
+        for (LogTag logTag : LogTag.values()) {
+            EnumSet<JfrLogTag> logTagSet = EnumSet.noneOf(JfrLogTag.class);
+            for (String t : logTag.name().split("_")) {
+                /* This fails if a new JDK version adds entries to jdk.jfr.internal. */
+                logTagSet.add(JfrLogTag.valueOf(t));
             }
+            VMError.guarantee(!logTagSet.isEmpty());
+            result.put(logTag, logTagSet);
         }
-
         return result;
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogTag.java

@@ -40,6 +40,7 @@ enum JfrLogTag {
     METADATA,
     STREAMING,
     THROTTLE,
+    PERIODIC,
     DCMD,
     START
 }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/logging/JfrLogging.java

@@ -38,21 +38,19 @@
 import jdk.jfr.internal.LogTag;
 
 public class JfrLogging {
-    private final JfrLogConfiguration configuration;
     private final String[] logLevels;
     private final String[] logTagSets;
     private int levelDecorationFill = 0;
     private int tagSetDecorationFill = 0;
 
     @Platforms(Platform.HOSTED_ONLY.class)
     public JfrLogging() {
-        configuration = new JfrLogConfiguration();
         logLevels = createLogLevels();
         logTagSets = createLogTagSets();
     }
 
     public void parseConfiguration(String config) {
-        configuration.parse(config);
+        JfrLogConfiguration.parse(config);
     }
 
     public void warnInternal(String message) {
@@ -94,8 +92,8 @@ public void logEvent(int level, String[] lines, boolean system) {
 
         LogTag logTag = system ? LogTag.JFR_SYSTEM_EVENT : LogTag.JFR_EVENT;
         int tagSetId = SubstrateUtil.cast(logTag, Target_jdk_jfr_internal_LogTag.class).id;
-        for (int i = 0; i < lines.length; i++) {
-            log(tagSetId, level, lines[i]);
+        for (String line : lines) {
+            log(tagSetId, level, line);
         }
     }