Update conditional in PosixSubstrateSigprofHandler.

oracle · Apr 17, 2024 · 4f2cba1 · 4f2cba1
1 parent 104613f
commit 4f2cba1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java b/...com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSubstrateSigprofHandler.java
@@ -55,6 +55,7 @@
 import com.oracle.svm.core.posix.darwin.DarwinSubstrateSigprofHandler;
 import com.oracle.svm.core.posix.headers.Signal;
 import com.oracle.svm.core.posix.linux.LinuxSubstrateSigprofHandler;
+import com.oracle.svm.core.sampler.ProfilingSampler;
 import com.oracle.svm.core.sampler.SubstrateSigprofHandler;
 import com.oracle.svm.core.thread.ThreadListenerSupport;
 import com.oracle.svm.core.thread.ThreadListenerSupportFeature;
@@ -141,7 +142,7 @@ public List<Class<? extends Feature>> getRequiredFeatures() {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
-        if (JfrExecutionSamplerSupported.isSupported() && isSignalHandlerBasedExecutionSamplerEnabled()) {
+        if (JfrExecutionSamplerSupported.isSupported() && isSignalHandlerBasedExecutionSamplerEnabled() && useAsyncSampler()) {
             SubstrateSigprofHandler sampler = makeNewSigprofHandler();
             ImageSingletons.add(JfrExecutionSampler.class, sampler);
             ImageSingletons.add(SubstrateSigprofHandler.class, sampler);
@@ -151,6 +152,10 @@ public void afterRegistration(AfterRegistrationAccess access) {
         }
     }
 
+    private static boolean useAsyncSampler() {
+        return !ImageSingletons.contains(ProfilingSampler.class) || ImageSingletons.lookup(ProfilingSampler.class).isAsyncSampler();
+    }
+
     private static SubstrateSigprofHandler makeNewSigprofHandler() {
         if (Platform.includedIn(Platform.LINUX.class)) {
             return new LinuxSubstrateSigprofHandler();