mikemccand commented on code in PR #15983:
URL: https://github.com/apache/lucene/pull/15983#discussion_r3154493070
##########
build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeProfilingPlugin.java:
##########
@@ -254,4 +255,14 @@ private record ProfilingOptions(
Provider<Integer> countOption,
Provider<Boolean> lineNumbersOption,
Provider<Boolean> frametypesOption) {}
+
+ /**
+ * JEP 509 CPU-time sampling ({@code jdk.CPUTimeSample}) is implemented on
Linux. Use a Linux-only
+ * JFR template with CPU-time sampling only; other hosts keep wall-clock
execution sampling for
+ * short tests.
Review Comment:
Wait, it's for all tests, not just short tests right? Maybe just remove `
for short tests`?
##########
build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeProfilingPlugin.java:
##########
@@ -254,4 +255,14 @@ private record ProfilingOptions(
Provider<Integer> countOption,
Provider<Boolean> lineNumbersOption,
Provider<Boolean> frametypesOption) {}
+
+ /**
+ * JEP 509 CPU-time sampling ({@code jdk.CPUTimeSample}) is implemented on
Linux. Use a Linux-only
+ * JFR template with CPU-time sampling only; other hosts keep wall-clock
execution sampling for
+ * short tests.
+ */
+ private static String profilingSettingsPath() {
+ String os = System.getProperty("os.name", "").toLowerCase(Locale.ROOT);
+ return os.contains("linux") ? "testing/profiling.linux.jfc" :
"testing/profiling.jfc";
Review Comment:
Actually, instead of baking `linux` in the name, could we use `cputime`?
Maybe in the future other OS's can support CPU time sampling too...
##########
gradle/testing/profiling.linux.jfc:
##########
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
+ Linux: JEP 509 jdk.CPUTimeSample only (no jdk.ExecutionSample /
jdk.NativeMethodSample).
+ Wall-clock sampling at 1 ms added measurable overhead in long runs; CPU-time
sampling keeps
+ short tests useful via a 1 ms throttle while avoiding duplicate wall-clock +
CPU samplers.
+-->
+<configuration version="2.0" label="TestProfilingLinux" description="CPU-time
sampling for unit tests (Linux)" provider="Apache">
+ <event name="jdk.ExecutionSample">
+ <setting name="enabled">false</setting>
Review Comment:
Oh, are these events enabled by default, so we have to have these entries
(`jdk.ExecutionSample` and `jdk.NativeMethodSample`) to explicitly then disable
them?
##########
build-tools/build-infra/src/main/java/org/apache/lucene/gradle/plugins/java/CodeProfilingPlugin.java:
##########
@@ -254,4 +255,14 @@ private record ProfilingOptions(
Provider<Integer> countOption,
Provider<Boolean> lineNumbersOption,
Provider<Boolean> frametypesOption) {}
+
+ /**
+ * JEP 509 CPU-time sampling ({@code jdk.CPUTimeSample}) is implemented on
Linux. Use a Linux-only
Review Comment:
Maybe `is currently (Java 25) implemented only on Linux, so we use a
Linux-only JFR template...`?
##########
lucene/CHANGES.txt:
##########
@@ -185,6 +185,11 @@ Changes in Runtime Behavior
Build
---------------------
+* GITHUB#15926: Support jdk.CPUTimeSample event (Java 25+, JEP 509) in
ProfileResults.
Review Comment:
Can we word a bit more user-friendly-y? Maybe `Use the new (Java 25+, JEP
509) CPU time sampling profiler when available (currently just on Linux), and
fall back to the legacy wall-clock...`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
