From 256c268fbe145a26a2dd7a11d239ac6be6f9dcd6 Mon Sep 17 00:00:00 2001
From: erik_gahlin <erik.gahlin@oracle.com>
Date: Fri, 4 Jul 2025 13:56:04 +0200
Subject: [PATCH 1/2] Initial

---
 src/hotspot/share/jfr/metadata/metadata.xml          | 12 +++++++-----
 .../share/classes/jdk/jfr/internal/query/view.ini    |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/hotspot/share/jfr/metadata/metadata.xml b/src/hotspot/share/jfr/metadata/metadata.xml
index d7287adb1a638..42d99e2477de2 100644
--- a/src/hotspot/share/jfr/metadata/metadata.xml
+++ b/src/hotspot/share/jfr/metadata/metadata.xml
@@ -948,22 +948,24 @@
     <Field type="long" contentType="bytes" name="freeSize" label="Free Size" description="Free swap space" />
   </Event>
 
-  <Event name="ExecutionSample" category="Java Virtual Machine, Profiling" label="Method Profiling Sample" description="Snapshot of a threads state"
+  <Event name="ExecutionSample" category="Java Virtual Machine, Profiling" label="Java Execution Sample"
+         description="Snapshot of a thread executing Java code. Threads that are not executing Java code, including those waiting or executing native code, are not included."
     period="everyChunk">
     <Field type="Thread" name="sampledThread" label="Thread" />
     <Field type="StackTrace" name="stackTrace" label="Stack Trace" />
     <Field type="ThreadState" name="state" label="Thread State" />
   </Event>
 
-  <Event name="NativeMethodSample" category="Java Virtual Machine, Profiling" label="Method Profiling Sample Native" description="Snapshot of a threads state when in native"
+  <Event name="NativeMethodSample" category="Java Virtual Machine, Profiling" label="Native Sample"
+         description="Snapshot of a thread in native code, executing or waiting. Threads that are executing Java code are not included."
     period="everyChunk">
     <Field type="Thread" name="sampledThread" label="Thread" />
     <Field type="StackTrace" name="stackTrace" label="Stack Trace" />
     <Field type="ThreadState" name="state" label="Thread State" />
   </Event>
 
-  <Event name="CPUTimeSample" category="Java Virtual Machine, Profiling" label="CPU Time Method Sample"
-    description="Snapshot of a threads state from the CPU time sampler. The throttle can be either an upper bound for the event emission rate, e.g. 100/s, or the cpu-time period, e.g. 10ms, with s, ms, us and ns supported as time units."
+  <Event name="CPUTimeSample" category="Java Virtual Machine, Profiling" label="CPU Time Sample"
+    description="Snapshot of a threads state from the CPU time sampler, both threads executing native and Java code are included. The throttle setting can be either an upper bound for the event emission rate, e.g. 100/s, or the cpu-time period, e.g. 10ms, with s, ms, us and ns supported as time units."
     throttle="true" thread="false" experimental="true" startTime="false">
     <Field type="StackTrace" name="stackTrace" label="Stack Trace" />
     <Field type="Thread" name="eventThread" label="Thread" />
@@ -972,7 +974,7 @@
     <Field type="boolean" name="biased" label="Biased" description="The sample is safepoint-biased" />
   </Event>
 
-  <Event name="CPUTimeSamplesLost" category="Java Virtual Machine, Profiling" label="CPU Time Method Profiling Lost Samples" description="Records that the CPU time sampler lost samples"
+  <Event name="CPUTimeSamplesLost" category="Java Virtual Machine, Profiling" label="CPU Time Samples Lost" description="Records that the CPU time sampler lost samples"
     thread="false" stackTrace="false" startTime="false" experimental="true">
     <Field type="int" name="lostSamples" label="Lost Samples" />
     <Field type="Thread" name="eventThread" label="Thread" />
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index fd9636f17ab71..ee57c3aff2485 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -518,10 +518,10 @@ table = "COLUMN 'Memory Type', 'First Observed', 'Average', 'Last Observed', 'Ma
 
 [application.native-methods]
 label = "Waiting or Executing Native Methods"
-table = "COLUMN 'Method', 'Samples', 'Percent'
-         FORMAT none, none, normalized
-         SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)
-         FROM NativeMethodSample GROUP BY T"
+table = "COLUMN 'Method', 'Samples'
+         FORMAT none, none
+         SELECT stackTrace.topFrame AS T, COUNT(*) AS C
+         FROM NativeMethodSample GROUP BY T ORDER BY C DESC"
 
 [environment.network-utilization]
 label = "Network Utilization"

From 80ead0b6ed6ff2c896009ea4c17b9c2a0d385a6e Mon Sep 17 00:00:00 2001
From: erik_gahlin <erik.gahlin@oracle.com>
Date: Mon, 7 Jul 2025 12:27:58 +0200
Subject: [PATCH 2/2] Fix typo

---
 src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
index ee57c3aff2485..6c73e0c7e60ac 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/query/view.ini
@@ -395,7 +395,7 @@ form = "SELECT LAST(initialSize), LAST(minSize), LAST(maxSize),
                FROM GCHeapConfiguration"
 
 [application.hot-methods]
-label = "Java Methods that Executes the Most"
+label = "Java Methods that Execute the Most"
 table = "COLUMN 'Method', 'Samples', 'Percent'
          FORMAT none, none, normalized
          SELECT stackTrace.topFrame AS T, COUNT(*), COUNT(*)