Skip to content

[GR-44820] Fix bundle support for --diagnostics-mode. #6208

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 4 commits into from
Mar 15, 2023
Merged

[GR-44820] Fix bundle support for --diagnostics-mode. #6208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e67dc74
Fix SubstrateOptions.reportsPath for absolute paths
olpaw Mar 14, 2023
9e0de1e
Ensure command line arguments diagnostics respects bundle support
olpaw Mar 14, 2023
a13a9f3
Write class initialization configuration diagnostics into same path a…
olpaw Mar 14, 2023
c54f51e
Use `useBundle()` instead of `bundleSupport != null`
olpaw Mar 14, 2023
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
10 changes: 7 additions & 3 deletions substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,14 +816,18 @@ public static final String getHeapDumpPath(String defaultFilename) {
public static final RuntimeOptionKey<String> FlightRecorderLogging = new RuntimeOptionKey<>("all=warning", Immutable);

public static String reportsPath() {
return Paths.get(Paths.get(Path.getValue()).toString(), ImageSingletons.lookup(ReportingSupport.class).reportsPath).toAbsolutePath().toString();
Path reportsPath = ImageSingletons.lookup(ReportingSupport.class).reportsPath;
if (reportsPath.isAbsolute()) {
return reportsPath.toString();
}
return Paths.get(Path.getValue()).resolve(reportsPath).toString();
}

public static class ReportingSupport {
String reportsPath;
Path reportsPath;

public ReportingSupport(Path reportingPath) {
this.reportsPath = reportingPath.toString();
this.reportsPath = reportingPath;
}
}

Expand Down
6 changes: 3 additions & 3 deletions substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/DefaultOptionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public boolean consume(ArgumentQueue args) {
return true;
case "--diagnostics-mode":
args.poll();
nativeImage.setDiagnostics(true);
nativeImage.enableDiagnostics();
nativeImage.addPlainImageBuilderArg("-H:+DiagnosticsMode");
nativeImage.addPlainImageBuilderArg("-H:DiagnosticsDir=" + nativeImage.diagnosticsDir);
System.out.println("# Diagnostics mode enabled: image-build reports are saved to " + nativeImage.diagnosticsDir);
Expand Down Expand Up @@ -217,7 +217,7 @@ public boolean consume(ArgumentQueue args) {
args.poll();
headArg = headArg.substring(1);
Path origArgFile = Paths.get(headArg);
Path argFile = nativeImage.bundleSupport != null ? nativeImage.bundleSupport.substituteAuxiliaryPath(origArgFile, BundleMember.Role.Input) : origArgFile;
Path argFile = nativeImage.useBundle() ? nativeImage.bundleSupport.substituteAuxiliaryPath(origArgFile, BundleMember.Role.Input) : origArgFile;
NativeImage.NativeImageArgsProcessor processor = nativeImage.new NativeImageArgsProcessor(OptionOrigin.argFilePrefix + argFile);
readArgFile(argFile).forEach(processor);
List<String> leftoverArgs = processor.apply(false);
Expand Down Expand Up @@ -458,7 +458,7 @@ private void handleJarFileArg(Path jarFilePath) {
String origin = "manifest from " + jarFilePath.toUri();
nativeImage.addPlainImageBuilderArg(NativeImage.injectHostedOptionOrigin(nativeImage.oHName + jarFileNameBase, origin));
}
Path finalFilePath = nativeImage.bundleSupport != null ? nativeImage.bundleSupport.substituteClassPath(jarFilePath) : jarFilePath;
Path finalFilePath = nativeImage.useBundle() ? nativeImage.bundleSupport.substituteClassPath(jarFilePath) : jarFilePath;
if (!NativeImage.processJarManifestMainAttributes(finalFilePath, nativeImage::handleMainClassAttribute)) {
NativeImage.showError("No manifest in " + finalFilePath);
}
Expand Down
31 changes: 17 additions & 14 deletions substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ private static <T> String oR(OptionKey<T> option) {

private int verbose = Boolean.valueOf(System.getenv("VERBOSE_GRAALVM_LAUNCHERS")) ? 1 : 0;
private boolean diagnostics = false;
String diagnosticsDir;
Path diagnosticsDir;
private boolean jarOptionMode = false;
private boolean moduleOptionMode = false;
private boolean dryRun = false;
Expand Down Expand Up @@ -776,7 +776,7 @@ protected NativeImage(BuildConfiguration config) {

void addMacroOptionRoot(Path configDir) {
Path origRootDir = canonicalize(configDir);
Path rootDir = bundleSupport != null ? bundleSupport.substituteClassPath(origRootDir) : origRootDir;
Path rootDir = useBundle() ? bundleSupport.substituteClassPath(origRootDir) : origRootDir;
optionRegistry.addMacroOptionRoot(rootDir);
}

Expand Down Expand Up @@ -1497,7 +1497,8 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> cp, LinkedHa
final String commandLine = SubstrateUtil.getShellCommandString(completeCommandList, true);
if (isDiagnostics()) {
// write to the diagnostics dir
ReportUtils.report("command line arguments", diagnosticsDir, "command-line", "txt", printWriter -> printWriter.write(commandLine));
Path finalDiagnosticsDir = useBundle() ? bundleSupport.substituteAuxiliaryPath(diagnosticsDir, BundleMember.Role.Output) : diagnosticsDir.toAbsolutePath();
ReportUtils.report("command line arguments", finalDiagnosticsDir.toString(), "command-line", "txt", printWriter -> printWriter.write(commandLine));
} else {
showVerboseMessage(isVerbose(), "Executing [");
showVerboseMessage(isVerbose(), commandLine);
Expand Down Expand Up @@ -1670,22 +1671,22 @@ Path canonicalize(Path path) {
}

Path canonicalize(Path path, boolean strict) {
if (bundleSupport != null) {
if (useBundle()) {
Path prev = bundleSupport.restoreCanonicalization(path);
if (prev != null) {
return prev;
}
}
Path absolutePath = path.isAbsolute() ? path : config.getWorkingDirectory().resolve(path);
if (!strict) {
return bundleSupport != null ? bundleSupport.recordCanonicalization(path, absolutePath) : absolutePath;
return useBundle() ? bundleSupport.recordCanonicalization(path, absolutePath) : absolutePath;
}
try {
Path realPath = absolutePath.toRealPath();
if (!Files.isReadable(realPath)) {
showError("Path entry " + path + " is not readable");
}
return bundleSupport != null ? bundleSupport.recordCanonicalization(path, realPath) : realPath;
return useBundle() ? bundleSupport.recordCanonicalization(path, realPath) : realPath;
} catch (IOException e) {
throw showError("Invalid Path entry " + path, e);
}
Expand Down Expand Up @@ -1805,7 +1806,7 @@ void addImageModulePath(Path modulePathEntry, boolean strict) {
return;
}

Path mpEntryFinal = bundleSupport != null ? bundleSupport.substituteModulePath(mpEntry) : mpEntry;
Path mpEntryFinal = useBundle() ? bundleSupport.substituteModulePath(mpEntry) : mpEntry;
imageModulePath.add(mpEntryFinal);
processClasspathNativeImageMetaInf(mpEntryFinal);
}
Expand Down Expand Up @@ -1869,7 +1870,7 @@ private void addImageClasspathEntry(LinkedHashSet<Path> destination, Path classp
return;
}

Path classpathEntryFinal = bundleSupport != null ? bundleSupport.substituteClassPath(classpathEntry) : classpathEntry;
Path classpathEntryFinal = useBundle() ? bundleSupport.substituteClassPath(classpathEntry) : classpathEntry;
if (!imageClasspath.contains(classpathEntryFinal) && !customImageClasspath.contains(classpathEntryFinal)) {
destination.add(classpathEntryFinal);
if (ClasspathUtils.isJar(classpathEntryFinal)) {
Expand All @@ -1887,13 +1888,15 @@ void addVerbose() {
verbose += 1;
}

void setDiagnostics(boolean val) {
diagnostics = val;
diagnosticsDir = Paths.get("reports", ReportUtils.timeStampedFileName("diagnostics", "")).toString();
if (val) {
addVerbose();
addVerbose();
void enableDiagnostics() {
if (diagnostics) {
/* Already enabled */
return;
}
diagnostics = true;
diagnosticsDir = Paths.get("reports", ReportUtils.timeStampedFileName("diagnostics", ""));
addVerbose();
addVerbose();
}

void setJarOptionMode(boolean val) {
Expand Down
4 changes: 1 addition & 3 deletions ....svm.hosted/src/com/oracle/svm/hosted/classinitialization/ClassInitializationSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

import static com.oracle.svm.core.SubstrateOptions.TraceObjectInstantiation;

import java.nio.file.Paths;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -103,8 +102,7 @@ public void setConfigurationSealed(boolean sealed) {
if (configurationSealed && ClassInitializationOptions.PrintClassInitialization.getValue()) {
List<ClassOrPackageConfig> allConfigs = classInitializationConfiguration.allConfigs();
allConfigs.sort(Comparator.comparing(ClassOrPackageConfig::getName));
String path = Paths.get(Paths.get(SubstrateOptions.Path.getValue()).toString(), "reports").toAbsolutePath().toString();
ReportUtils.report("class initialization configuration", path, "class_initialization_configuration", "csv", writer -> {
ReportUtils.report("class initialization configuration", SubstrateOptions.reportsPath(), "class_initialization_configuration", "csv", writer -> {
writer.println("Class or Package Name, Initialization Kind, Reasons");
for (ClassOrPackageConfig config : allConfigs) {
writer.append(config.getName()).append(", ").append(config.getKind().toString()).append(", ")
Expand Down