svm: move FileSystemProviderSupport to buildtimeinit

Author: zapster

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/JRTSupport.java

@@ -62,7 +62,7 @@
  */
 public final class JRTSupport {
 
-    static class Options {
+    public static class Options {
         @Option(help = "Enable support for reading Java modules (jimage format) and the jrt:// file system. Requires java.home to be set at runtime.", type = OptionType.Expert) //
         public static final HostedOptionKey<Boolean> AllowJRTFileSystem = new HostedOptionKey<>(false);
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/FileSystemProviderSupport.java renamed to substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/buildtimeinit/FileSystemProviderBuildTimeInitSupport.java

@@ -23,7 +23,7 @@
  * questions.
  */
 
-package com.oracle.svm.core.jdk;
+package com.oracle.svm.core.jdk.buildtimeinit;
 
 import java.nio.file.spi.FileSystemProvider;
 import java.util.ArrayList;
@@ -45,14 +45,27 @@
 import com.oracle.svm.core.annotate.TargetElement;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
+import com.oracle.svm.core.jdk.JDKInitializedAtBuildTime;
+import com.oracle.svm.core.jdk.JRTSupport;
+import com.oracle.svm.core.jdk.SystemPropertiesSupport;
+import com.oracle.svm.core.jdk.UserSystemProperty;
 import com.oracle.svm.core.option.HostedOptionKey;
 import com.oracle.svm.core.util.BasedOnJDKFile;
 import com.oracle.svm.core.util.VMError;
 
 import jdk.graal.compiler.options.Option;
 import jdk.internal.util.StaticProperty;
 
-public final class FileSystemProviderSupport {
+/**
+ * This file contains substitutions that are required for initializing {@link FileSystemProvider} at
+ * image {@linkplain JDKInitializedAtBuildTime build time}. Other related functionality (general and
+ * run-time initialization) can be found in
+ * {@link com.oracle.svm.core.jdk.runtimeinit.FileSystemProviderRuntimeInitSupport}.
+ *
+ * @see JDKInitializedAtBuildTime
+ * @see com.oracle.svm.core.jdk.runtimeinit.FileSystemProviderRuntimeInitSupport
+ */
+public final class FileSystemProviderBuildTimeInitSupport {
 
     public static class Options {
         @Option(help = "Make all supported providers returned by FileSystemProvider.installedProviders() available at run time.")//
@@ -63,7 +76,7 @@ public static class Options {
     final List<FileSystemProvider> installedProvidersImmutable;
 
     @Platforms(Platform.HOSTED_ONLY.class)
-    FileSystemProviderSupport(List<FileSystemProvider> installedProviders) {
+    FileSystemProviderBuildTimeInitSupport(List<FileSystemProvider> installedProviders) {
         this.installedProvidersMutable = installedProviders;
         this.installedProvidersImmutable = Collections.unmodifiableList(installedProviders);
     }
@@ -75,7 +88,7 @@ public static class Options {
      */
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void register(FileSystemProvider provider) {
-        List<FileSystemProvider> installedProviders = ImageSingletons.lookup(FileSystemProviderSupport.class).installedProvidersMutable;
+        List<FileSystemProvider> installedProviders = ImageSingletons.lookup(FileSystemProviderBuildTimeInitSupport.class).installedProvidersMutable;
 
         String scheme = provider.getScheme();
         for (int i = 0; i < installedProviders.size(); i++) {
@@ -98,7 +111,7 @@ public static void register(FileSystemProvider provider) {
      */
     @Platforms(Platform.HOSTED_ONLY.class)
     public static void remove(String scheme) {
-        List<FileSystemProvider> installedProviders = ImageSingletons.lookup(FileSystemProviderSupport.class).installedProvidersMutable;
+        List<FileSystemProvider> installedProviders = ImageSingletons.lookup(FileSystemProviderBuildTimeInitSupport.class).installedProvidersMutable;
 
         for (int i = 0; i < installedProviders.size(); i++) {
             /*
@@ -115,12 +128,12 @@ public static void remove(String scheme) {
 }
 
 @AutomaticallyRegisteredFeature
-final class FileSystemProviderFeature implements InternalFeature {
+final class FileSystemProviderBuildTimeInitFeature implements InternalFeature {
 
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         List<FileSystemProvider> installedProviders = new ArrayList<>();
-        if (FileSystemProviderSupport.Options.AddAllFileSystemProviders.getValue()) {
+        if (FileSystemProviderBuildTimeInitSupport.Options.AddAllFileSystemProviders.getValue()) {
             /*
              * The first invocation of FileSystemProvider.installedProviders() causes the default
              * provider to be initialized (if not already initialized) and loads any other installed
@@ -133,11 +146,11 @@ public void afterRegistration(AfterRegistrationAccess access) {
              */
             installedProviders.addAll(FileSystemProvider.installedProviders());
         }
-        ImageSingletons.add(FileSystemProviderSupport.class, new FileSystemProviderSupport(installedProviders));
+        ImageSingletons.add(FileSystemProviderBuildTimeInitSupport.class, new FileSystemProviderBuildTimeInitSupport(installedProviders));
 
         /* Access to Java modules (jimage/jrtfs access) in images is experimental. */
         if (!JRTSupport.Options.AllowJRTFileSystem.getValue()) {
-            FileSystemProviderSupport.remove("jrt");
+            FileSystemProviderBuildTimeInitSupport.remove("jrt");
         }
     }
 }
@@ -146,7 +159,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
 final class Target_java_nio_file_spi_FileSystemProvider {
     @Substitute
     public static List<FileSystemProvider> installedProviders() {
-        return ImageSingletons.lookup(FileSystemProviderSupport.class).installedProvidersImmutable;
+        return ImageSingletons.lookup(FileSystemProviderBuildTimeInitSupport.class).installedProvidersImmutable;
     }
 }
 
@@ -160,7 +173,8 @@ public static List<FileSystemProvider> installedProviders() {
  *
  * a) Disallow UnixFileSystem and UnixFileSystemProvider in the image heap, i.e., create all
  * instances at run time. This is undesirable because then all file system providers need to be
- * loaded at run time, i.e., the caching in {@link FileSystemProviderSupport} would no longer work.
+ * loaded at run time, i.e., the caching in {@link FileSystemProviderBuildTimeInitSupport} would no
+ * longer work.
  *
  * b) Disallow UnixFileSystem in the image heap, but have the UnixFileSystemProvider instance in the
  * image heap. This requires a recomputation of the field UnixFileSystemProvider.theFileSystem at

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/buildtimeinit/package-info.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016, 2025, 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.
+ */
+
+/**
+ * This package contains "legacy" substitutions and features that are required to support
+ * initializing certain parts of the JDK at image
+ * {@linkplain com.oracle.svm.core.jdk.JDKInitializedAtBuildTime build time}. Those parts of the JDK
+ * are planned to be initialized at {@linkplain com.oracle.svm.core.jdk.JDKInitializedAtRunTime run
+ * time} in the {@linkplain com.oracle.svm.core.FutureDefaultsOptions future}. Once run time
+ * initialization is the default, this package will be removed.
+ */
+package com.oracle.svm.core.jdk.buildtimeinit;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/runtimeinit/FileSystemProviderRuntimeInitSupport.java

@@ -40,20 +40,21 @@
 import com.oracle.svm.core.feature.AutomaticallyRegisteredFeature;
 import com.oracle.svm.core.feature.InternalFeature;
 import com.oracle.svm.core.jdk.JDKInitializedAtRunTime;
+import com.oracle.svm.core.jdk.buildtimeinit.FileSystemProviderBuildTimeInitSupport;
 import com.oracle.svm.core.jdk.resources.NativeImageResourceFileSystemProvider;
 import com.oracle.svm.core.util.BasedOnJDKFile;
 import com.oracle.svm.core.util.VMError;
 import com.oracle.svm.util.ReflectionUtil;
 
 /**
  * This file contains substitutions that are required for initializing {@link FileSystemProvider} at
- * image run time. Other related functionality (general and build time initialization) can be found
- * in {@link com.oracle.svm.core.jdk.FileSystemProviderSupport}.
+ * image {@linkplain JDKInitializedAtRunTime run time}. Other related functionality (general and
+ * build time initialization) can be found in {@link FileSystemProviderBuildTimeInitSupport}.
  *
  * @see JDKInitializedAtRunTime
- * @see com.oracle.svm.core.jdk.FileSystemProviderSupport
+ * @see FileSystemProviderBuildTimeInitSupport
  */
-final class FileSystemProviderRuntimeInitSupport {
+public final class FileSystemProviderRuntimeInitSupport {
 }
 
 @AutomaticallyRegisteredFeature

web-image/src/com.oracle.svm.hosted.webimage/src/com/oracle/svm/hosted/webimage/WebImageFeature.java

@@ -70,10 +70,10 @@
 import com.oracle.svm.core.heap.RestrictHeapAccessCallees;
 import com.oracle.svm.core.hub.DynamicHub;
 import com.oracle.svm.core.hub.DynamicHubCompanion;
-import com.oracle.svm.core.jdk.FileSystemProviderSupport;
 import com.oracle.svm.core.jdk.PlatformNativeLibrarySupport;
 import com.oracle.svm.core.jdk.SystemInOutErrSupport;
 import com.oracle.svm.core.jdk.SystemPropertiesSupport;
+import com.oracle.svm.core.jdk.buildtimeinit.FileSystemProviderBuildTimeInitSupport;
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.option.HostedOptionValues;
 import com.oracle.svm.core.util.VMError;
@@ -323,7 +323,7 @@ public void afterRegistration(AfterRegistrationAccess access) {
          * Registers our own file system provider, which replaces the default provider for the
          * 'file' scheme.
          */
-        FileSystemProviderSupport.register(WebImageNIOFileSystemProvider.INSTANCE);
+        FileSystemProviderBuildTimeInitSupport.register(WebImageNIOFileSystemProvider.INSTANCE);
     }
 
     @Override