check live jdk11

fandreuz · fandreuz · commit f3560ee58aee · 2025-05-20T08:53:40.000Z
diff --git a/src/allocTracer.cpp b/src/allocTracer.cpp
@@ -71,6 +71,9 @@ void AllocTracer::recordAllocation(void* ucontext, EventType event_type, uintptr
 
 Error AllocTracer::check(Arguments& args) {
     if (args._live) {
+        // This engine is only going to be selected in Profiler::selectAllocEngine
+        // when can_generate_sampled_object_alloc_events is not available, i.e.
+        // JDK<11.
         return Error("'live' option is supported on OpenJDK 11+");
     }
 
diff --git a/src/profiler.cpp b/src/profiler.cpp
@@ -1214,6 +1214,10 @@ Error Profiler::start(Arguments& args, bool reset) {
     }
 
     if (_event_mask & EM_ALLOC) {
+        if (args._all && VM::hotspot_version() < 11) {
+            Log::debug("'live' option was quietly removed, only supported on OpenJDK 11+");
+            args._live = false;
+        }
         _alloc_engine = selectAllocEngine(args._alloc, args._live);
         error = _alloc_engine->start(args);
         if (error) {
diff --git a/test/test/jfr/JfrTests.java b/test/test/jfr/JfrTests.java
@@ -88,10 +88,10 @@ public void parseMultiModeRecording(TestProcess p) throws Exception {
      * @param p The test process to profile with.
      * @throws Exception Any exception thrown during profiling JFR output parsing.
      */
-    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,file=%f.jfr", os = Os.LINUX, jvmVer = {11, Integer.MAX_VALUE})
-    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,alloc=100,file=%f.jfr", os = Os.LINUX, jvmVer = {11, Integer.MAX_VALUE})
-    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,file=%f.jfr", os = Os.MACOS, arch = Arch.ARM64, jvmVer = {11, Integer.MAX_VALUE})
-    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,lock=10ms,file=%f.jfr", os = Os.MACOS, arch = Arch.ARM64, jvmVer = {11, Integer.MAX_VALUE})
+    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,file=%f.jfr", os = Os.LINUX)
+    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,alloc=100,file=%f.jfr", os = Os.LINUX)
+    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,file=%f.jfr", os = Os.MACOS, arch = Arch.ARM64)
+    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,lock=10ms,file=%f.jfr", os = Os.MACOS, arch = Arch.ARM64)
     public void allModeNoEventOverride(TestProcess p) throws Exception {
         p.waitForExit();
         assert p.exitCode() == 0;
@@ -109,7 +109,7 @@ public void allModeNoEventOverride(TestProcess p) throws Exception {
         assert events.contains("jdk.JavaMonitorEnter"); // lock profiling
         assert events.contains("jdk.ObjectAllocationInNewTLAB"); // alloc profiling
         assert events.contains("profiler.WallClockSample"); // wall clock profiling
-        assert events.contains("profiler.LiveObject"); // profiling of live objects
+        assert events.contains("profiler.LiveObject") || checkJdkVersionEarlierThan11(); // profiling of live objects
         assert events.contains("profiler.Malloc"); // nativemem profiling
         assert events.contains("profiler.Free"); // nativemem profiling
     }
@@ -122,8 +122,8 @@ public void allModeNoEventOverride(TestProcess p) throws Exception {
      * @param p The test process to profile with.
      * @throws Exception Any exception thrown during profiling JFR output parsing.
      */
-    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,event=java.util.Properties.getProperty,alloc=100,file=%f.jfr", os = Os.LINUX, jvmVer = {11, Integer.MAX_VALUE})
-    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,event=java.util.Properties.getProperty,alloc=100,file=%f.jfr", os = Os.MACOS, arch = Arch.ARM64, jvmVer = {11, Integer.MAX_VALUE})
+    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,event=java.util.Properties.getProperty,alloc=100,file=%f.jfr", os = Os.LINUX)
+    @Test(mainClass = JfrMultiModeProfiling.class, agentArgs = "start,all,event=java.util.Properties.getProperty,alloc=100,file=%f.jfr", os = Os.MACOS, arch = Arch.ARM64)
     public void allModeEventOverride(TestProcess p) throws Exception {
         p.waitForExit();
         assert p.exitCode() == 0;
@@ -142,7 +142,7 @@ public void allModeEventOverride(TestProcess p) throws Exception {
         assert events.contains("jdk.JavaMonitorEnter"); // lock profiling
         assert events.contains("jdk.ObjectAllocationInNewTLAB"); // alloc profiling
         assert events.contains("profiler.WallClockSample"); // wall clock profiling
-        assert events.contains("profiler.LiveObject"); // profiling of live objects
+        assert events.contains("profiler.LiveObject") || checkJdkVersionEarlierThan11(); // profiling of live objects
         assert events.contains("profiler.Malloc"); // nativemem profiling
         assert events.contains("profiler.Free"); // nativemem profiling
     }
@@ -153,14 +153,13 @@ public void allModeEventOverride(TestProcess p) throws Exception {
      * @param p The test process to profile with.
      * @throws Exception Any exception thrown during profiling JFR output parsing.
      */
-    @Test(mainClass = Ttsp.class, agentArgs = "start,event=cpu,ttsp,interval=1ms,jfr,file=%f")
+    @Test(mainClass = Ttsp.class)
     public void ttsp(TestProcess p) throws Exception {
-        p.waitForExit();
-        assert p.exitCode() == 0;
+        p.profile("-d 3 -i 1ms --ttsp -f %f.jfr");
         assert !containsSamplesOutsideWindow(p) : "Expected no samples outside of ttsp window";
 
         Output out = Output.convertJfrToCollapsed(p.getFilePath("%f"));
-        assert out.samples("Ttsp.delaySafepoint") >= 10;
+        assert out.samples("indexOfTest") >= 10;
     }
 
     /**
@@ -169,10 +168,9 @@ public void ttsp(TestProcess p) throws Exception {
      * @param p The test process to profile with.
      * @throws Exception Any exception thrown during profiling JFR output parsing.
      */
-    @Test(mainClass = Ttsp.class, agentArgs = "start,event=cpu,ttsp,nostop,interval=1ms,jfr,file=%f")
+    @Test(mainClass = Ttsp.class)
     public void ttspNostop(TestProcess p) throws Exception {
-        p.waitForExit();
-        assert p.exitCode() == 0;
+        p.profile("-d 3 -i 1ms --ttsp --nostop -f %f.jfr");
         assert containsSamplesOutsideWindow(p) : "Expected to find samples outside of ttsp window";
     }
 
@@ -197,4 +195,9 @@ private boolean containsSamplesOutsideWindow(TestProcess p) throws Exception {
             return entryEnd.isBefore(event.getStartTime());
         });
     }
+
+    private static boolean checkJdkVersionEarlierThan11() {
+        String javaVersion = System.getProperty("java.version");
+        return javaVersion.startsWith("1.") || Integer.parseInt(javaVersion.split("\\.")[0]) < 11;
+    }
 }
