Remove obsolete agent-based image build code.

oracle · Oct 2, 2023 · 8ce7298 · 8ce7298
1 parent 04a68ca
commit 8ce7298
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 64 deletions.
diff --git a/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java b/substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java
@@ -38,7 +38,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.ConcurrentModificationException;
 import java.util.Date;
 import java.util.List;
@@ -76,12 +75,10 @@
 import com.oracle.svm.configure.filters.HierarchyFilterNode;
 import com.oracle.svm.configure.trace.AccessAdvisor;
 import com.oracle.svm.configure.trace.TraceProcessor;
-import com.oracle.svm.core.SubstrateUtil;
 import com.oracle.svm.core.configure.ConfigurationFile;
 import com.oracle.svm.core.jni.headers.JNIEnvironment;
 import com.oracle.svm.core.jni.headers.JNIJavaVM;
 import com.oracle.svm.core.jni.headers.JNIObjectHandle;
-import com.oracle.svm.driver.NativeImage;
 import com.oracle.svm.driver.metainf.NativeImageMetaInfWalker;
 import com.oracle.svm.jvmtiagentbase.JNIHandleSet;
 import com.oracle.svm.jvmtiagentbase.JvmtiAgentBase;
@@ -143,7 +140,6 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
         boolean experimentalClassDefineSupport = false;
         boolean experimentalUnsafeAllocationSupport = false;
         boolean experimentalOmitClasspathConfig = false;
-        boolean build = false;
         boolean configurationWithOrigins = false;
         List<String> conditionalConfigUserPackageFilterFiles = new ArrayList<>();
         List<String> conditionalConfigClassNameFilterFiles = new ArrayList<>();
@@ -206,8 +202,6 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
                 if (configWritePeriodInitialDelay < 0) {
                     return usage(1, "config-write-initial-delay-secs must be an integer greater or equal to 0");
                 }
-            } else if (isBooleanOption(token, "build")) {
-                build = getBooleanTokenValue(token);
             } else if (isBooleanOption(token, "experimental-configuration-with-origins")) {
                 configurationWithOrigins = getBooleanTokenValue(token);
             } else if (token.startsWith("experimental-conditional-config-filter-file=")) {
@@ -223,9 +217,9 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
             }
         }
 
-        if (traceOutputFile == null && configOutputDir == null && !build) {
+        if (traceOutputFile == null && configOutputDir == null) {
             configOutputDir = transformPath(AGENT_NAME + "_config-pid{pid}-{datetime}/");
-            inform("no output/build options provided, tracking dynamic accesses and writing configuration to directory: " + configOutputDir);
+            inform("no output options provided, tracking dynamic accesses and writing configuration to directory: " + configOutputDir);
         }
 
         if (configurationWithOrigins && !conditionalConfigUserPackageFilterFiles.isEmpty()) {
@@ -377,14 +371,6 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
             }
         }
 
-        if (build) {
-            int status = buildImage(jvmti);
-            if (status == 0) {
-                System.exit(status);
-            }
-            return status;
-        }
-
         try {
             BreakpointInterceptor.onLoad(jvmti, callbacks, tracer, this, interceptedStateSupplier,
                             experimentalClassLoaderSupport, experimentalClassDefineSupport, experimentalUnsafeAllocationSupport, trackReflectionMetadata);
@@ -504,46 +490,6 @@ private static void ignoreConfigFromClasspath(JvmtiEnv jvmti, ConfigurationFileC
     private static final Pattern propertyBlacklist = Pattern.compile("(java\\..*)|(sun\\..*)|(jvmci\\..*)");
     private static final Pattern propertyWhitelist = Pattern.compile("(java\\.library\\.path)|(java\\.io\\.tmpdir)");
 
-    private static int buildImage(JvmtiEnv jvmti) {
-        System.out.println("Building native image ...");
-        String classpath = Support.getSystemProperty(jvmti, "java.class.path");
-        if (classpath == null) {
-            return usage(1, "Build mode could not determine classpath.");
-        }
-        String javaCommand = Support.getSystemProperty(jvmti, "sun.java.command");
-        String mainClassMissing = "Build mode could not determine main class.";
-        if (javaCommand == null) {
-            return usage(1, mainClassMissing);
-        }
-        String mainClass = SubstrateUtil.split(javaCommand, " ")[0];
-        if (mainClass.isEmpty()) {
-            return usage(1, mainClassMissing);
-        }
-        List<String> buildArgs = new ArrayList<>();
-        // buildArgs.add("--verbose");
-        String[] keys = Support.getSystemProperties(jvmti);
-        for (String key : keys) {
-            boolean whitelisted = propertyWhitelist.matcher(key).matches();
-            boolean blacklisted = !whitelisted && propertyBlacklist.matcher(key).matches();
-            if (blacklisted) {
-                continue;
-            }
-            buildArgs.add("-D" + key + "=" + Support.getSystemProperty(jvmti, key));
-        }
-        if (mainClass.toLowerCase().endsWith(".jar")) {
-            buildArgs.add("-jar");
-        } else {
-            buildArgs.addAll(Arrays.asList("-cp", classpath));
-        }
-        buildArgs.add(mainClass);
-        buildArgs.add(AGENT_NAME + ".build");
-        // System.out.println(String.join("\n", buildArgs));
-        Path javaHome = Paths.get(Support.getSystemProperty(jvmti, "java.home"));
-        String userDirStr = Support.getSystemProperty(jvmti, "user.dir");
-        NativeImage.agentBuild(javaHome, userDirStr == null ? null : Paths.get(userDirStr), buildArgs);
-        return 0;
-    }
-
     private static String transformPath(String path) {
         String result = path;
         if (result.contains("{pid}")) {

diff --git a/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java
@@ -1814,14 +1814,6 @@ public static void main(String[] args) {
         performBuild(new BuildConfiguration(Arrays.asList(args)), defaultNativeImageProvider);
     }
 
-    public static void build(BuildConfiguration config) {
-        build(config, defaultNativeImageProvider);
-    }
-
-    public static void agentBuild(Path javaHome, Path workDir, List<String> buildArgs) {
-        performBuild(new BuildConfiguration(javaHome, workDir, buildArgs), NativeImage::new);
-    }
-
     public static List<String> translateAPIOptions(List<String> arguments) {
         var handler = new APIOptionHandler(new NativeImage(new BuildConfiguration(arguments)));
         var argumentQueue = new ArgumentQueue(OptionOrigin.originDriver);