Skip to content

Commit

Permalink
Fix jfr substitution issue with 17.0.11
Browse files Browse the repository at this point in the history
JDK-8288663, new in 17.0.11, renamed the method being substituted.

(cherry picked from commit 556d068)
  • Loading branch information
jerboaa authored and zakkak committed Mar 11, 2024
1 parent 1479817 commit f24e1ce
Show file tree
Hide file tree
Showing 3 changed files with 84 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.svm.core.jdk;

import java.util.function.BooleanSupplier;

import org.graalvm.compiler.serviceprovider.GraalServices;
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;

public class JDK17_0_10OrEarlier implements BooleanSupplier {

@Override
public boolean getAsBoolean() {
return JavaVersionUtil.JAVA_SPEC < 17 ||
(JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() <= 10);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
* particular file as subject to the "Classpath" exception as provided
* by Oracle in the LICENSE file that accompanied this code.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.svm.core.jdk;

import java.util.function.BooleanSupplier;

import org.graalvm.compiler.serviceprovider.GraalServices;
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;

public class JDK17_0_11OrLater implements BooleanSupplier {

@Override
public boolean getAsBoolean() {
return JavaVersionUtil.JAVA_SPEC > 17 ||
(JavaVersionUtil.JAVA_SPEC == 17 && GraalServices.getJavaUpdateVersion() >= 11);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
import com.oracle.svm.core.jdk.JDK11OrEarlier;
import com.oracle.svm.core.jdk.JDK17OrEarlier;
import com.oracle.svm.core.jdk.JDK17OrLater;
import com.oracle.svm.core.jdk.JDK17_0_10OrEarlier;
import com.oracle.svm.core.jdk.JDK17_0_11OrLater;
import com.oracle.svm.core.jdk.JDK19OrLater;
import com.oracle.svm.core.jfr.traceid.JfrTraceId;
import com.oracle.svm.core.util.VMError;
Expand Down Expand Up @@ -208,14 +210,14 @@ public void setMemorySize(long size) throws IllegalArgumentException {

/** See {@code JVM#setMethodSamplingInterval}. */
@Substitute
@TargetElement(onlyWith = JDK17OrEarlier.class)
@TargetElement(onlyWith = JDK17_0_10OrEarlier.class)
public void setMethodSamplingInterval(long type, long intervalMillis) {
SubstrateJVM.get().setMethodSamplingInterval(type, intervalMillis);
}

/** See {@code JVM#setMethodSamplingPeriod}. */
@Substitute
@TargetElement(onlyWith = JDK19OrLater.class)
@TargetElement(onlyWith = JDK17_0_11OrLater.class)
public void setMethodSamplingPeriod(long type, long intervalMillis) {
SubstrateJVM.get().setMethodSamplingInterval(type, intervalMillis);
}
Expand Down

0 comments on commit f24e1ce

Please sign in to comment.