Skip to content

Commit e18afcc

Browse files
pecimuthmur47x111
authored andcommitted
[JDK-8362259] Adapt JDK-8358619: Fix interval recomputation in CPU Time Profiler.
PullRequest: graal/21473
2 parents e27ee1c + 504abfb commit e18afcc

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

ci/ci_common/galahad-common.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ local utils = import "common-utils.libsonnet";
1111
,
1212
# Return true if this is a gate job.
1313
local is_gate(b) =
14-
std.find("gate", b.targets) != []
14+
std.setInter(["gate", "tier1", "tier2", "tier3"], b.targets) != []
1515
,
16-
local gate_or_postmerge_targets = ["gate", "post-merge", "deploy"],
16+
local gate_or_postmerge_targets = ["gate", "tier1", "tier2", "tier3", "post-merge", "deploy"],
1717
# Return true if this is a gate or post-merge/deployment job.
1818
local is_gate_or_postmerge(b) =
1919
std.setInter(gate_or_postmerge_targets, b.targets) != []

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {
11-
"galahad-jdk": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-26+6-570", "platformspecific": true, "extrabundles": ["static-libs"]},
11+
"galahad-jdk": {"name": "jpg-jdk", "version": "26", "build_id": "jdk-26+7-655", "platformspecific": true, "extrabundles": ["static-libs"]},
1212

1313
"oraclejdk17": {"name": "jpg-jdk", "version": "17.0.7", "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
1414
"labsjdk-ce-17": {"name": "labsjdk", "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/Target_jdk_jfr_internal_JVM.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,15 @@ public static void setMethodSamplingPeriod(long type, long intervalMillis) {
296296
SubstrateJVM.get().setMethodSamplingInterval(type, intervalMillis);
297297
}
298298

299-
/** See {@code JVM#setCPUThrottle}. */
299+
/** See {@code JVM#setCPURate}. */
300300
@Substitute
301-
public static void setCPUThrottle(double rate, boolean autoAdapt) {
301+
public static void setCPURate(double rate) {
302+
// JFR CPUTimeSample is not supported.
303+
}
304+
305+
/** See {@code JVM#setCPUPeriod}. */
306+
@Substitute
307+
public static void setCPUPeriod(long periodNanos) {
302308
// JFR CPUTimeSample is not supported.
303309
}
304310

0 commit comments

Comments
 (0)