Skip to content

[GR-59924] [GR-59935] Fix JFR-specific substitutions on JDK21. #10129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[GR-59924] [GR-59935] Fix JFR-specific substitutions on JDK21. #10129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a9b439
Fix type of Target_java_lang_ClassLoader.classes.
christianhaeubl Nov 21, 2024
ad5126d
JDK 21-specific fix for JFR.
christianhaeubl Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...evm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_java_lang_ClassLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
import java.io.File;
import java.net.URL;
import java.security.ProtectionDomain;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Set;
import java.util.Vector;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;
Expand Down Expand Up @@ -67,7 +67,7 @@ public final class Target_java_lang_ClassLoader {
* invoked by the VM to record every loaded class with this loader".
*/
@Alias @RecomputeFieldValue(kind = Kind.Reset)//
private Vector<Class<?>> classes;
private ArrayList<Class<?>> classes;

@Alias @RecomputeFieldValue(kind = Kind.NewInstanceWhenNotNull, declClass = ConcurrentHashMap.class)//
private ConcurrentHashMap<String, Object> parallelLockMap;
Expand Down
13 changes: 12 additions & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jfr/JfrJdkCompatibility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ public static String makeFilename(Recording recording) {

@Alias
public static native String formatTimespan(Duration dValue, String separation);

@Alias
public static native String formatDateTime(LocalDateTime time);
}

@TargetClass(className = "jdk.jfr.internal.JVMSupport", onlyWith = {JDKLatest.class, HasJfrSupport.class})
Expand Down Expand Up @@ -169,9 +172,17 @@ final class Target_jdk_jfr_internal_PlatformRecording {
final class JfrFilenameUtil {
public static String makeFilename(Recording recording) {
long pid = ProcessProperties.getProcessID();
String date = Target_jdk_jfr_internal_util_ValueFormatter.formatDateTime(LocalDateTime.now());
String date = getFormatDateTime();
String idText = recording == null ? "" : "-id-" + recording.getId();
String imageName = SubstrateOptions.Name.getValue();
return imageName + "-pid-" + pid + idText + "-" + date + ".jfr";
}

private static String getFormatDateTime() {
LocalDateTime now = LocalDateTime.now();
if (JavaVersionUtil.JAVA_SPEC >= 24) {
return Target_jdk_jfr_internal_util_ValueFormatter.formatDateTime(now);
}
return Target_jdk_jfr_internal_Utils.formatDateTime(now);
}
}
Loading