8287113: JFR: Periodic task thread uses period for method sampling ev…

…ents Backport-of: 8122466fbb8e3f3450131895551ec5b832845938
openjdk · Jun 21, 2022 · f1d3fa9 · f1d3fa9 · openjdk-notifier · Jun 21, 2022
1 parent 50c0080
commit f1d3fa9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java
@@ -83,7 +83,7 @@ private void initializeJVMEventTypes() {
                 // annotations, such as Period and Threshold.
                 if (pEventType.hasPeriod()) {
                     pEventType.setEventHook(true);
-                    if (!(Type.EVENT_NAME_PREFIX + "ExecutionSample").equals(type.getName())) {
+                    if (!pEventType.isMethodSampling()) {
                         requestHooks.add(new RequestHook(pEventType));
                     }
                 }

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/PlatformEventType.java
@@ -327,4 +327,8 @@ public boolean isLargeSize() {
     public void setLargeSize() {
         largeSize = true;
     }
+
+    public boolean isMethodSampling() {
+        return isMethodSampling;
+    }
 }