Skip to content

[GR-56296] Backport: Add reflection metadata for jfrTracing field. #9380

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

Merged
merged 1 commit into from
Jul 29, 2024
Merged

[GR-56296] Backport: Add reflection metadata for jfrTracing field. #9380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions substratevm/mx.substratevm/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@
"jdk.internal.module",
"sun.text.spi",
"jdk.internal.reflect",
"sun.nio.ch",
"sun.util.cldr",
"sun.util.locale",
"sun.invoke.util",
Expand Down
18 changes: 16 additions & 2 deletions substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/jfr/JfrEventFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,17 @@
*/
package com.oracle.svm.hosted.jfr;

import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.RandomAccessFile;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.Collections;
import java.util.List;

import org.graalvm.nativeimage.ImageSingletons;
import org.graalvm.nativeimage.hosted.Feature;
import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
import org.graalvm.nativeimage.hosted.RuntimeReflection;

import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
import com.oracle.svm.core.feature.InternalFeature;
Expand All @@ -45,10 +48,12 @@
import com.oracle.svm.core.meta.SharedType;
import com.oracle.svm.core.util.VMError;
import com.oracle.svm.hosted.FeatureImpl;
import com.oracle.svm.hosted.reflect.ReflectionFeature;

import jdk.internal.event.Event;
import jdk.jfr.internal.JVM;
import jdk.vm.ci.meta.MetaAccessProvider;
import sun.nio.ch.FileChannelImpl;

/**
* Support for Java-level JFR events. This feature is only present if the {@link JfrFeature} is used
Expand All @@ -63,7 +68,16 @@ public boolean isInConfiguration(IsInConfigurationAccess access) {

@Override
public List<Class<? extends Feature>> getRequiredFeatures() {
return Collections.singletonList(JfrFeature.class);
return List.of(JfrFeature.class, ReflectionFeature.class);
}

@Override
public void afterRegistration(AfterRegistrationAccess access) {
RuntimeReflection.registerFieldLookup(Throwable.class, "jfrTracing");
RuntimeReflection.registerFieldLookup(FileInputStream.class, "jfrTracing");
RuntimeReflection.registerFieldLookup(FileOutputStream.class, "jfrTracing");
RuntimeReflection.registerFieldLookup(FileChannelImpl.class, "jfrTracing");
RuntimeReflection.registerFieldLookup(RandomAccessFile.class, "jfrTracing");
}

@Override
Expand Down