Skip to content
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

Rework passing of arguments between the driver and the native-image generator runner #183

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Rework passing of arguments between the driver and the native-image generator runner #183

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
b66c6c9
Rework passing of arguments between the driver and the native-image g…
Nov 23, 2020
b155924
Write image options to a file, with each option separated by a null t…
Nov 30, 2020
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
61 changes: 27 additions & 34 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 @@ -67,9 +67,8 @@
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import org.graalvm.compiler.options.OptionKey;
import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
Expand All @@ -89,6 +88,7 @@
import com.oracle.svm.driver.MacroOption.MacroOptionKind;
import com.oracle.svm.driver.MacroOption.Registry;
import com.oracle.svm.hosted.AbstractNativeImageClassLoaderSupport;
import com.oracle.svm.hosted.NativeImageGeneratorRunner;
import com.oracle.svm.hosted.NativeImageSystemClassLoader;
import com.oracle.svm.util.ModuleSupport;

Expand Down Expand Up @@ -1248,6 +1248,27 @@ protected static List<String> createImageBuilderArgs(LinkedHashSet<String> image
return result;
}

protected static String createImageBuilderArgumentFile(List<String> imageBuilderArguments) {
try {
Path argsFile = Files.createTempFile("native-image", "args");
String joinedOptions = String.join("\0", imageBuilderArguments);
Files.write(argsFile, joinedOptions.getBytes());
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
try {
Files.delete(argsFile);
} catch (IOException e) {
System.err.println("Failed to delete temporary image builder arguments file: " + argsFile.toString());
}
}
});
return NativeImageGeneratorRunner.IMAGE_BUILDER_ARG_FILE_OPTION + argsFile.toString();
} catch (IOException e) {
throw showError(e.getMessage());
}
}

protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> bcp, LinkedHashSet<Path> cp, LinkedHashSet<String> imageArgs, LinkedHashSet<Path> imagecp) {
/* Construct ProcessBuilder command from final arguments */
List<String> command = new ArrayList<>();
Expand All @@ -1266,10 +1287,12 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> bcp, LinkedH
*/
command.addAll(Arrays.asList(SubstrateOptions.WATCHPID_PREFIX, "" + ProcessProperties.getProcessID()));
}
command.addAll(createImageBuilderArgs(imageArgs, imagecp));
List<String> finalImageBuilderArgs = createImageBuilderArgs(imageArgs, imagecp);
List<String> completeCommandList = Stream.concat(command.stream(), finalImageBuilderArgs.stream()).collect(Collectors.toList());
command.add(createImageBuilderArgumentFile(finalImageBuilderArgs));

showVerboseMessage(isVerbose() || dryRun, "Executing [");
showVerboseMessage(isVerbose() || dryRun, SubstrateUtil.getShellCommandString(command, true));
showVerboseMessage(isVerbose() || dryRun, SubstrateUtil.getShellCommandString(completeCommandList, true));
showVerboseMessage(isVerbose() || dryRun, "]");

if (dryRun) {
Expand All @@ -1278,46 +1301,16 @@ protected int buildImage(List<String> javaArgs, LinkedHashSet<Path> bcp, LinkedH

int exitStatus = 1;
try {
Path[] argsFileBox = new Path[1];
if (config.useJavaModules()) {
/* For Java > 8 we use an argument file to pass the options to the builder */
Path argsFile = Files.createTempFile("native-image", "args");
argsFileBox[0] = argsFile;
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
if (argsFileBox[0] != null) {
argsFileBox[0].toFile().delete();
}
}
});
Files.write(argsFile, (Iterable<String>) command.stream().skip(1).map(NativeImage::quoteFileArg)::iterator);
List<String> atCommand = new ArrayList<>();
atCommand.add(command.get(0));
atCommand.add("@" + argsFile);
command = atCommand;
}
ProcessBuilder pb = new ProcessBuilder();
pb.command(command);
Process p = pb.inheritIO().start();
exitStatus = p.waitFor();
if (exitStatus != 0 && isVerbose()) {
argsFileBox[0] = null;
}
} catch (IOException | InterruptedException e) {
throw showError(e.getMessage());
}
return exitStatus;
}

private static String quoteFileArg(String arg) {
String resultArg = arg.replaceAll(Pattern.quote("\\"), Matcher.quoteReplacement("\\\\"));
if (resultArg.contains(" ")) {
resultArg = "\"" + resultArg + "\"";
}
return resultArg;
}

private static final Function<BuildConfiguration, NativeImage> defaultNativeImageProvider = config -> IS_AOT ? NativeImageServer.create(config) : new NativeImage(config);

public static void main(String[] args) {
Expand Down
22 changes: 21 additions & 1 deletion ...atevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.TimerTask;
import java.util.concurrent.ForkJoinPool;
import java.util.function.Consumer;
import java.util.stream.Collectors;

import org.graalvm.collections.Pair;
import org.graalvm.compiler.debug.DebugContext;
Expand Down Expand Up @@ -80,9 +82,11 @@
public class NativeImageGeneratorRunner implements ImageBuildTask {

private volatile NativeImageGenerator generator;
public static final String IMAGE_BUILDER_ARG_FILE_OPTION = "--image-args-file=";

public static void main(String[] args) {
ArrayList<String> arguments = new ArrayList<>(Arrays.asList(args));
List<String> arguments = new ArrayList<>(Arrays.asList(args));
arguments = extractDriverArguments(arguments);
final String[] classPath = extractImagePathEntries(arguments, SubstrateOptions.IMAGE_CLASSPATH_PREFIX);
int watchPID = extractWatchPID(arguments);
TimerTask timerTask = null;
Expand Down Expand Up @@ -172,6 +176,22 @@ public static ImageClassLoader installNativeImageClassLoader(String[] classpath,
return new ImageClassLoader(NativeImageGenerator.defaultPlatform(nativeImageClassLoader), nativeImageClassLoaderSupport);
}

public static List<String> extractDriverArguments(List<String> args) {
ArrayList<String> result = args.stream().filter(arg -> !arg.startsWith(IMAGE_BUILDER_ARG_FILE_OPTION)).collect(Collectors.toCollection(ArrayList::new));
Optional<String> argsFile = args.stream().filter(arg -> arg.startsWith(IMAGE_BUILDER_ARG_FILE_OPTION)).findFirst();

if (argsFile.isPresent()) {
String argFilePath = argsFile.get().substring(IMAGE_BUILDER_ARG_FILE_OPTION.length());
try {
String options = new String(Files.readAllBytes(Paths.get(argFilePath)));
result.addAll(Arrays.asList(options.split("\0")));
} catch (IOException e) {
throw VMError.shouldNotReachHere("Exception occurred during image builder argument file processing.", e);
}
}
return result;
}

public static String[] extractImagePathEntries(List<String> arguments, String pathPrefix) {
int cpArgIndex = arguments.indexOf(pathPrefix);
String msgTail = " '" + pathPrefix + " <Path entries separated by File.pathSeparator>' argument.";
Expand Down