8280131: jcmd reports "Module jdk.jfr not found." when "jdk.management.jfr" is missing

Reviewed-by: mgronlun, alanb

src/hotspot/share/jfr/dcmd/jfrDcmds.cpp

@@ -56,10 +56,6 @@ bool register_jfr_dcmds() {
   return true;
 }
 
-static bool is_module_available(outputStream* output, TRAPS) {
-  return JfrJavaSupport::is_jdk_jfr_module_available(output, THREAD);
-}
-
 static bool is_disabled(outputStream* output) {
   if (Jfr::is_disabled()) {
     if (output != NULL) {
@@ -72,7 +68,28 @@ static bool is_disabled(outputStream* output) {
 
 static bool invalid_state(outputStream* out, TRAPS) {
   DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
-  return is_disabled(out) || !is_module_available(out, THREAD);
+  if (is_disabled(out)) {
+    return true;
+  }
+  if (!JfrJavaSupport::is_jdk_jfr_module_available()) {
+    JfrJavaSupport::load_jdk_jfr_module(THREAD);
+    if (HAS_PENDING_EXCEPTION) {
+      // Log exception here, but let is_jdk_jfr_module_available(out, THREAD)
+      // handle output to the user.
+      ResourceMark rm(THREAD);
+      oop throwable = PENDING_EXCEPTION;
+      assert(throwable != nullptr, "invariant");
+      oop msg = java_lang_Throwable::message(throwable);
+      if (msg != nullptr) {
+        char* text = java_lang_String::as_utf8_string(msg);
+        if (text != nullptr) {
+          log_debug(jfr, startup)("Flight Recorder can not be enabled. %s", text);
+        }
+      }
+      CLEAR_PENDING_EXCEPTION;
+    }
+  }
+  return !JfrJavaSupport::is_jdk_jfr_module_available(out, THREAD);
 }
 
 static void handle_pending_exception(outputStream* output, bool startup, oop throwable) {

src/hotspot/share/jfr/jni/jfrJavaSupport.cpp

@@ -45,6 +45,7 @@
 #include "runtime/handles.inline.hpp"
 #include "runtime/fieldDescriptor.inline.hpp"
 #include "runtime/java.hpp"
+#include "runtime/javaCalls.hpp"
 #include "runtime/javaThread.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/semaphore.inline.hpp"
@@ -625,6 +626,23 @@ JfrJavaSupport::CAUSE JfrJavaSupport::cause() {
 const char* const JDK_JFR_MODULE_NAME = "jdk.jfr";
 const char* const JDK_JFR_PACKAGE_NAME = "jdk/jfr";
 
+
+
+void JfrJavaSupport::load_jdk_jfr_module(TRAPS) {
+  DEBUG_ONLY(JfrJavaSupport::check_java_thread_in_vm(THREAD));
+  ResourceMark rm(THREAD);
+  HandleMark hm(THREAD);
+  Handle h_module_name = java_lang_String::create_from_str(JDK_JFR_MODULE_NAME, CHECK);
+  JavaValue result(T_OBJECT);
+  JavaCalls::call_static(&result,
+    vmClasses::module_Modules_klass(),
+    vmSymbols::loadModule_name(),
+    vmSymbols::loadModule_signature(),
+    h_module_name,
+    CHECK
+  );
+}
+
 static bool is_jdk_jfr_module_in_readability_graph() {
   // take one of the packages in the module to be located and query for its definition.
   TempNewSymbol pkg_sym = SymbolTable::new_symbol(JDK_JFR_PACKAGE_NAME);

src/hotspot/share/jfr/jni/jfrJavaSupport.hpp

@@ -96,6 +96,7 @@ class JfrJavaSupport : public AllStatic {
   static void throw_class_format_error(const char* message, TRAPS);
   static void throw_runtime_exception(const char* message, TRAPS);
 
+  static void load_jdk_jfr_module(TRAPS);
   static bool is_jdk_jfr_module_available();
   static bool is_jdk_jfr_module_available(outputStream* stream, TRAPS);
 

src/hotspot/share/runtime/arguments.cpp

@@ -1957,6 +1957,14 @@ bool Arguments::check_vm_args_consistency() {
   }
 #endif
 
+#if INCLUDE_JFR
+  if (status && (FlightRecorderOptions || StartFlightRecording)) {
+    if (!create_numbered_module_property("jdk.module.addmods", "jdk.jfr", addmods_count++)) {
+      return false;
+    }
+  }
+#endif
+
 #ifndef SUPPORT_RESERVED_STACK_AREA
   if (StackReservedPages != 0) {
     FLAG_SET_CMDLINE(StackReservedPages, 0);

test/jdk/jdk/jfr/jvm/TestJfrJavaBase.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-/**
- * @test
- * @bug 8157032
- * @key jfr
- * @summary verify that jfr can not be used when JVM is executed only with java.base
- * @requires vm.hasJFR & !vm.graal.enabled
- * @library /test/lib
- * @modules java.base/jdk.internal.misc
- * @run driver jdk.jfr.jvm.TestJfrJavaBase
- */
-
-package jdk.jfr.jvm;
-
-
-import jdk.test.lib.dcmd.PidJcmdExecutor;
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-public class TestJfrJavaBase {
-
-    private static void checkOutput(OutputAnalyzer output) {
-        output.shouldContain("Module jdk.jfr not found.");
-        output.shouldContain("Flight Recorder can not be enabled.");
-    }
-
-    public static void main(String[] args) throws Exception {
-        OutputAnalyzer output;
-        if (args.length == 0) {
-            output = ProcessTools.executeProcess(ProcessTools.createJavaProcessBuilder(
-                "-Dtest.jdk=" + System.getProperty("test.jdk"),
-                "--limit-modules", "java.base", "-cp", System.getProperty("java.class.path"),
-                TestJfrJavaBase.class.getName(), "runtest"));
-            output.shouldHaveExitValue(0);
-        } else {
-            output = ProcessTools.executeTestJava("-XX:StartFlightRecording:dumponexit=true",
-                "--limit-modules", "java.base", "-version");
-            checkOutput(output);
-            output.shouldHaveExitValue(1);
-
-            // Verify that JFR.start jcmd command reports an error when jdk.jfr module is not available
-            output = new PidJcmdExecutor().execute("JFR.start");
-            checkOutput(output);
-            output.shouldHaveExitValue(0);
-        }
-    }
-}

test/jdk/jdk/jfr/jvm/TestModularImage.java

@@ -0,0 +1,184 @@
+/*
+ * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package jdk.jfr.jvm;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.spi.ToolProvider;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * @test
+ * @key jfr
+ * @summary Checks that a JDK image with and without the jdk.jfr module behaves
+ *          as expected
+ * @requires vm.hasJFR
+ * @library /test/lib
+ * @run driver jdk.jfr.jvm.TestModularImage
+ */
+public class TestModularImage {
+    private static final String STARTED_RECORDING = "Started recording";
+    private static final String HELLO_WORLD = "hello, world";
+    private static final String ERROR_LINE1 = "Error occurred during initialization of boot layer";
+    private static final String ERROR_LINE2 = "java.lang.module.FindException: Module jdk.jfr not found";
+
+    private static final ToolProvider javac = find("javac");
+    private static final ToolProvider jlink = find("jlink");
+
+    private static final Path out = Path.of("out");
+    private static final Path src = out.resolve("src");
+    private static final Path classes = out.resolve("classes");
+
+    private static final Path testJDK = Path.of(System.getProperty("test.jdk"));
+    private static final Path jmods = testJDK.resolve("jmods");
+
+    private static final String modulePath = jmods.toString() + File.pathSeparator + classes.toString();
+
+    public static void main(String[] args) throws Exception {
+        preparseSourceTree();
+        compileSourceCode();
+
+        // Jcmd for the current JVM where jdk.attach module is available
+        String currentJcmd = JDKToolFinder.getJDKTool("jcmd");
+        currentJcmd = Path.of(currentJcmd).normalize().toAbsolutePath().toString();
+
+        // Image 1: Should be able to start JFR if jdk.jfr module is present
+        Path javaBin1 = jlink("hello.world,jdk.jfr", "with-jfr");
+        testCommandLineWithJFR(javaBin1);
+        testJcmdWithJFR(javaBin1, currentJcmd);
+
+        // Image 2: Should fail if jdk.jfr module is not present
+        Path javaBin2 = jlink("hello.world", "without-jfr");
+        testCommandLineWithoutJFR(javaBin2);
+        testJcmdWithoutJFR(javaBin2, currentJcmd);
+    }
+
+    private static void testCommandLineWithJFR(Path binPath) throws Exception {
+        var result = java(binPath, "-XX:StartFlightRecording", "--module", "hello.world/hello.Main");
+        result.shouldNotContain(ERROR_LINE1);
+        result.shouldNotContain(ERROR_LINE2);
+        result.shouldContain(HELLO_WORLD);
+        result.shouldContain(STARTED_RECORDING);
+        result.shouldHaveExitValue(0);
+    }
+
+    private static void testJcmdWithJFR(Path binPath, String jcmd) throws Exception {
+        var result = java(binPath, "--module", "hello.world/hello.Main", jcmd);
+        result.shouldContain(HELLO_WORLD);
+        result.shouldNotContain(ERROR_LINE1);
+        result.shouldNotContain(ERROR_LINE2);
+        result.shouldContain(STARTED_RECORDING);
+        result.shouldHaveExitValue(0);
+    }
+
+    private static void testCommandLineWithoutJFR(Path binPath) throws Exception {
+        var result = java(binPath, "-XX:StartFlightRecording", "--module", "hello.world/hello.Main");
+        result.shouldContain(ERROR_LINE1);
+        result.shouldContain(ERROR_LINE2);
+        result.shouldNotContain(HELLO_WORLD);
+        result.shouldNotContain(STARTED_RECORDING);
+        result.shouldHaveExitValue(1);
+    }
+
+    private static void testJcmdWithoutJFR(Path binPath, String jcmd) throws Exception {
+        OutputAnalyzer result = java(binPath, "--module", "hello.world/hello.Main", jcmd);
+        result.shouldContain(HELLO_WORLD);
+        result.shouldContain("Module jdk.jfr not found.");
+        result.shouldContain("Flight Recorder can not be enabled.");
+        result.shouldNotContain(STARTED_RECORDING);
+        result.shouldHaveExitValue(0);
+    }
+
+    private static ToolProvider find(String tool) {
+        return ToolProvider.findFirst(tool).orElseThrow(() -> new RuntimeException("No " + tool));
+    }
+
+    private static void preparseSourceTree() throws IOException {
+        String main =
+        """
+        package hello;
+        import java.io.ByteArrayOutputStream;
+        public class Main {
+          public static void main(String... args) throws Exception {
+            System.out.println("hello, world!");
+            if (args.length > 0) {
+              long pid = ProcessHandle.current().pid();
+              String jcmd = args[0];
+              String[] cmds = { jcmd, Long.toString(pid), "JFR.start" };
+              Process process = new ProcessBuilder(cmds).redirectErrorStream(true).start();
+              process.waitFor();
+              var baos = new ByteArrayOutputStream();
+              process.getInputStream().transferTo(baos);
+              System.out.println(baos.toString());
+              System.exit(process.exitValue());
+            }
+          }
+        }
+        """;
+        String moduleInfo = "module hello.world {}";
+        Path helloWorld = src.resolve("hello.world");
+        Files.createDirectories(helloWorld.resolve("hello"));
+        Files.write(helloWorld.resolve("module-info.java"), moduleInfo.getBytes());
+        Files.write(helloWorld.resolve("hello").resolve("Main.java"), main.getBytes());
+    }
+
+    private static void compileSourceCode() {
+        javac.run(System.out, System.err,
+            "--module-source-path", src.toString(),
+            "--module", "hello.world",
+            "-d", classes.toString());
+    }
+
+    private static Path jlink(String modules, String output) {
+        jlink.run(System.out, System.err,
+            "--add-modules", modules,
+            "--module-path", modulePath,
+            "--output", output);
+        return Path.of(output).resolve("bin").toAbsolutePath();
+    }
+
+    private static OutputAnalyzer java(Path jvm, String... args) throws Exception {
+        ProcessBuilder pb = new ProcessBuilder();
+        String java = Platform.isWindows() ? "java.exe" : "java";
+        List<String> arguments = new ArrayList<>();
+        arguments.add(jvm.resolve(java).toString());
+        arguments.addAll(Arrays.asList(args));
+        pb.command(arguments);
+        pb.directory(jvm.toFile());
+        System.out.println("Executing: java " + String.join(" ", args));
+        OutputAnalyzer result = ProcessTools.executeProcess(pb);
+        System.out.println("--- Output ----" + "-".repeat(65));
+        System.out.println(result.getOutput());
+        System.out.println("-".repeat(80));
+        return result;
+    }
+}