Skip to content

[GR-65849] Avoid tracing during VM operations. #11416

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
Jun 17, 2025
+21 −3
Merged

[GR-65849] Avoid tracing during VM operations. #11416

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
24 changes: 21 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/metadata/MetadataTracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import com.oracle.svm.core.option.HostedOptionKey;
import com.oracle.svm.core.option.RuntimeOptionKey;
import com.oracle.svm.core.option.SubstrateOptionsParser;
import com.oracle.svm.core.thread.VMOperation;
import com.oracle.svm.core.util.VMError;

import jdk.graal.compiler.api.replacements.Fold;
Expand Down Expand Up @@ -89,6 +90,11 @@ public static class Options {
}

private RecordOptions options;

/**
* The configuration set to trace with. Do not read this field directly when tracing; instead
* use {@link #getConfigurationSetForTracing()} to acquire it.
*/
private volatile ConfigurationSet config;

@Fold
Expand All @@ -104,6 +110,18 @@ public boolean enabled() {
return options != null;
}

/**
* Returns the configuration set to trace with. Returns {@code null} if tracing should not be
* performed for some reason.
*/
private ConfigurationSet getConfigurationSetForTracing() {
if (VMOperation.isInProgress()) {
// Do not trace during VM operations.
return null;
}
return config;
}

/**
* Marks the given type as reachable from reflection.
*
Expand All @@ -123,7 +141,7 @@ public void traceProxyType(List<String> interfaceNames) {

private ConfigurationType traceReflectionTypeImpl(ConfigurationTypeDescriptor typeDescriptor) {
assert enabled();
ConfigurationSet configurationSet = config;
ConfigurationSet configurationSet = getConfigurationSetForTracing();
if (configurationSet != null) {
return configurationSet.getReflectionConfiguration().getOrCreateType(UnresolvedConfigurationCondition.alwaysTrue(), typeDescriptor);
}
Expand All @@ -150,7 +168,7 @@ public ConfigurationType traceJNIType(String className) {
*/
public void traceResource(String resourceName, String moduleName) {
assert enabled();
ConfigurationSet configurationSet = config;
ConfigurationSet configurationSet = getConfigurationSetForTracing();
if (configurationSet != null) {
configurationSet.getResourceConfiguration().addGlobPattern(UnresolvedConfigurationCondition.alwaysTrue(), resourceName, moduleName);
}
Expand All @@ -161,7 +179,7 @@ public void traceResource(String resourceName, String moduleName) {
*/
public void traceResourceBundle(String baseName) {
assert enabled();
ConfigurationSet configurationSet = config;
ConfigurationSet configurationSet = getConfigurationSetForTracing();
if (configurationSet != null) {
configurationSet.getResourceConfiguration().addBundle(UnresolvedConfigurationCondition.alwaysTrue(), baseName, List.of());
}
Expand Down