-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for
$NATIVE_IMAGE_OPTIONS.
- Loading branch information
Showing
7 changed files
with
202 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
141 changes: 141 additions & 0 deletions
141
substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/util/JDKArgsUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,141 @@ | ||
| /* | ||
| * Copyright (c) 2022, 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. Oracle designates this | ||
| * particular file as subject to the "Classpath" exception as provided | ||
| * by Oracle in the LICENSE file that accompanied this code. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| */ | ||
| package com.oracle.svm.hosted.util; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.function.Function; | ||
|
|
||
| /** Ported utils from JDK21's java.base/share/native/libjli/args.c. */ | ||
| public class JDKArgsUtils { | ||
|
|
||
| public static List<String> parseArgsFromEnvVar(String envVarValue, String envVarName, Function<String, Error> errorFunction) { | ||
| List<String> result = new ArrayList<>(); | ||
| int envVarValueLength = envVarValue.length(); | ||
| int i = 0; | ||
| while (i < envVarValueLength) { | ||
| while (i < envVarValueLength && isspace(envVarValue.charAt(i))) { | ||
| i++; | ||
| } | ||
|
|
||
| // Trailing space | ||
| if (i >= envVarValueLength) { | ||
| break; | ||
| } | ||
|
|
||
| char currentChar; | ||
| StringBuilder argChars = new StringBuilder(); | ||
| while (i < envVarValueLength && !isspace(currentChar = envVarValue.charAt(i))) { | ||
| if (currentChar == '"' || currentChar == '\'') { | ||
| char quote = currentChar; | ||
| i++; | ||
| while (i < envVarValueLength && envVarValue.charAt(i) != quote) { | ||
| argChars.append(envVarValue.charAt(i++)); | ||
| } | ||
| if (i >= envVarValueLength) { | ||
| throw errorFunction.apply("Unmatched quote in environment variable " + envVarName); | ||
| } | ||
| i++; | ||
| } else { | ||
| argChars.append(envVarValue.charAt(i++)); | ||
| } | ||
| } | ||
| String argument = argChars.toString(); | ||
| // This port is more restrictive as it forbids arg files to be passed via an env var | ||
| boolean isArgFileOption = argument.startsWith("@") && !argument.startsWith("@@"); | ||
| if (isArgFileOption || isTerminalOpt(argument)) { | ||
| throw errorFunction.apply("Option '" + argument + "' is not allowed in environment variable " + envVarName); | ||
| } else if (!isExpectingNoDashArg(argument, result)) { | ||
| throw errorFunction.apply("Cannot specify main class in environment variable " + envVarName); | ||
| } | ||
| result.add(argument); | ||
| assert i >= envVarValueLength || isspace(envVarValue.charAt(i)); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| private static boolean isExpectingNoDashArg(String argument, List<String> previousArgs) { | ||
| if (argument.startsWith("-")) { | ||
| return true; // Ignore dash args | ||
| } | ||
| if (previousArgs.isEmpty()) { | ||
| return false; // No previous arg means the no-dash arg is unexpected | ||
| } | ||
| String previousArg = previousArgs.getLast(); | ||
| // Derivation from port: unpack any flags for JVM running the image generator | ||
| previousArg = previousArg.startsWith("-J") ? previousArg.substring(2) : previousArg; | ||
| boolean expectingNoDashArg = isWhiteSpaceOption(previousArg); | ||
| if ("-jar".equals(previousArg) || "--module".equals(previousArg) || "-m".equals(previousArg)) { | ||
| expectingNoDashArg = false; | ||
| } | ||
| return expectingNoDashArg; | ||
| } | ||
|
|
||
| public static boolean isspace(char value) { | ||
| // \v not supported in Java | ||
| return value == ' ' || value == '\f' || value == '\n' || value == '\r' || value == '\t'; | ||
| } | ||
|
|
||
| private static boolean isTerminalOpt(String arg) { | ||
| return switch (arg) { | ||
| /* JDK terminal options supported by SVM */ | ||
| case "-jar", "-m", "--module", "--dry-run", "--help", "--help-extra", "--version" -> true; | ||
| /* JDK terminal options not (yet) supported by SVM */ | ||
| case "-h", "-?", "-help", "-X", "-version", "-fullversion", "--full-version" -> true; | ||
| /* SVM-only terminal options */ | ||
| case "--expert-options", "--expert-options-all", "--expert-options-detail" -> true; | ||
| default -> arg.startsWith("--module="); | ||
| }; | ||
| } | ||
|
|
||
| private static boolean isWhiteSpaceOption(String name) { | ||
| return isModuleOption(name) || isLauncherOption(name); | ||
| } | ||
|
|
||
| private static boolean isModuleOption(String name) { | ||
| return switch (name) { | ||
| case "--module-path", "-p", "--upgrade-module-path", "--add-modules", "--enable-native-access", "--limit-modules", "--add-exports", "--add-opens", "--add-reads", "--patch-module" -> true; | ||
| default -> false; | ||
| }; | ||
| } | ||
|
|
||
| private static boolean isLauncherOption(String name) { | ||
| return isClassPathOption(name) || | ||
| isLauncherMainOption(name) || | ||
| "--describe-module".equals(name) || | ||
| "-d".equals(name) || | ||
| "--source".equals(name); | ||
| } | ||
|
|
||
| private static boolean isClassPathOption(String name) { | ||
| return "-classpath".equals(name) || | ||
| "-cp".equals(name) || | ||
| "--class-path".equals(name); | ||
| } | ||
|
|
||
| private static boolean isLauncherMainOption(String name) { | ||
| return "--module".equals(name) || "-m".equals(name); | ||
| } | ||
| } |