[GR-71642] Use EconomicMap in LayeredModuleSingleton.

PullRequest: graal/22728

Author: wirthi

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

@@ -24,12 +24,12 @@
  */
 package com.oracle.svm.core.jdk;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
+import org.graalvm.collections.EconomicMap;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
@@ -48,19 +48,19 @@ public abstract class LayeredModuleSingleton {
     public static final String ALL_UNNAMED_MODULE_NAME = "native-image-all-unnamed";
     public static final String EVERYONE_MODULE_NAME = "native-image-everyone";
 
-    protected final Map<String, Map<String, Set<String>>> moduleOpenPackages;
-    protected final Map<String, Map<String, Set<String>>> moduleExportedPackages;
+    protected final EconomicMap<String, Map<String, Set<String>>> moduleOpenPackages;
+    protected final EconomicMap<String, Map<String, Set<String>>> moduleExportedPackages;
 
-    private final Map<String, ResolvedJavaModule> nameToModule = new HashMap<>();
+    private final EconomicMap<String, ResolvedJavaModule> nameToModule = EconomicMap.create();
 
     private ResolvedJavaModule everyoneModule;
     private ResolvedJavaModule allUnnamedModule;
 
     public LayeredModuleSingleton() {
-        this(new HashMap<>(), new HashMap<>());
+        this(EconomicMap.create(), EconomicMap.create());
     }
 
-    public LayeredModuleSingleton(Map<String, Map<String, Set<String>>> moduleOpenPackages, Map<String, Map<String, Set<String>>> moduleExportedPackages) {
+    public LayeredModuleSingleton(EconomicMap<String, Map<String, Set<String>>> moduleOpenPackages, EconomicMap<String, Map<String, Set<String>>> moduleExportedPackages) {
         this.moduleOpenPackages = moduleOpenPackages;
         this.moduleExportedPackages = moduleExportedPackages;
     }
@@ -82,8 +82,17 @@ public Map<String, Set<String>> getExportedPackages(ResolvedJavaModule module) {
         return moduleExportedPackages.get(module.getName());
     }
 
-    public Collection<ResolvedJavaModule> getModules() {
-        return nameToModule.values();
+    public Iterable<ResolvedJavaModule> getModules() {
+        return nameToModule.getValues();
+    }
+
+    public boolean containsModule(ResolvedJavaModule module) {
+        for (ResolvedJavaModule m : nameToModule.getValues()) {
+            if (m.equals(module)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public void setOpenPackages(ResolvedJavaModule module, Map<String, Set<Module>> openPackages) {
@@ -94,7 +103,7 @@ public void setExportedPackages(ResolvedJavaModule module, Map<String, Set<Modul
         setPackages(module, moduleExportedPackages, exportedPackages, "exported");
     }
 
-    private void setPackages(ResolvedJavaModule module, Map<String, Map<String, Set<String>>> modulePackages, Map<String, Set<Module>> packages, String mode) {
+    private void setPackages(ResolvedJavaModule module, EconomicMap<String, Map<String, Set<String>>> modulePackages, Map<String, Set<Module>> packages, String mode) {
         ResolvedJavaModule oldValue = nameToModule.put(module.toString(), module);
         if (oldValue != null && !oldValue.equals(module)) {
             throw UserError.abort("Layered images require all modules to have a different name because their identity hash code is not consistent across layers. " +

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/HostedLayeredModuleSingleton.java

@@ -47,6 +47,7 @@
 import com.oracle.svm.hosted.imagelayer.SVMImageLayerWriter;
 import com.oracle.svm.hosted.imagelayer.SharedLayerSnapshotCapnProtoSchemaHolder.ModulePackages;
 import com.oracle.svm.shaded.org.capnproto.StructList;
+import org.graalvm.collections.EconomicMap;
 
 @AutomaticallyRegisteredImageSingleton(value = LayeredModuleSingleton.class, onlyWith = BuildingInitialLayerPredicate.class)
 @SingletonTraits(access = BuildtimeAccessOnly.class, layeredCallbacks = HostedLayeredModuleSingleton.LayeredCallbacks.class, layeredInstallationKind = Independent.class)
@@ -55,17 +56,18 @@ public HostedLayeredModuleSingleton() {
         super();
     }
 
-    public HostedLayeredModuleSingleton(Map<String, Map<String, Set<String>>> moduleOpenPackages, Map<String, Map<String, Set<String>>> moduleExportedPackages) {
+    public HostedLayeredModuleSingleton(EconomicMap<String, Map<String, Set<String>>> moduleOpenPackages, EconomicMap<String, Map<String, Set<String>>> moduleExportedPackages) {
         super(moduleOpenPackages, moduleExportedPackages);
     }
 
     static class LayeredCallbacks extends SingletonLayeredCallbacksSupplier {
-        private static void persistModulePackages(StructList.Builder<ModulePackages.Builder> modulePackagesBuilder, Map<String, Map<String, Set<String>>> modulePackages) {
+        private static void persistModulePackages(StructList.Builder<ModulePackages.Builder> modulePackagesBuilder, EconomicMap<String, Map<String, Set<String>>> modulePackages) {
             int i = 0;
-            for (var entry : modulePackages.entrySet()) {
+            var it = modulePackages.getEntries();
+            while (it.advance()) {
                 var entryBuilder = modulePackagesBuilder.get(i);
-                entryBuilder.setModuleKey(entry.getKey());
-                Map<String, Set<String>> value = entry.getValue();
+                entryBuilder.setModuleKey(it.getKey());
+                Map<String, Set<String>> value = it.getValue();
                 var packagesBuilder = entryBuilder.initPackages(value.size());
                 int j = 0;
                 for (var packageEntry : value.entrySet()) {
@@ -100,8 +102,8 @@ public Class<? extends LayeredSingletonInstantiator<?>> getSingletonInstantiator
     }
 
     static class SingletonInstantiator implements SingletonLayeredCallbacks.LayeredSingletonInstantiator<HostedLayeredModuleSingleton> {
-        private static Map<String, Map<String, Set<String>>> getModulePackages(StructList.Reader<ModulePackages.Reader> modulePackagesReader) {
-            Map<String, Map<String, Set<String>>> modulePackages = new HashMap<>();
+        private static EconomicMap<String, Map<String, Set<String>>> getModulePackages(StructList.Reader<ModulePackages.Reader> modulePackagesReader) {
+            EconomicMap<String, Map<String, Set<String>>> modulePackages = EconomicMap.create();
             for (int i = 0; i < modulePackagesReader.size(); ++i) {
                 var entryReader = modulePackagesReader.get(i);
                 var packagesReader = entryReader.getPackages();
@@ -121,8 +123,8 @@ public HostedLayeredModuleSingleton createFromLoader(ImageSingletonLoader loader
             SVMImageLayerSingletonLoader.ImageSingletonLoaderImpl loaderImpl = (SVMImageLayerSingletonLoader.ImageSingletonLoaderImpl) loader;
             var reader = loaderImpl.getSnapshotReader().getLayeredModule();
 
-            Map<String, Map<String, Set<String>>> moduleOpenPackages = getModulePackages(reader.getOpenModulePackages());
-            Map<String, Map<String, Set<String>>> moduleExportedPackages = getModulePackages(reader.getExportedModulePackages());
+            EconomicMap<String, Map<String, Set<String>>> moduleOpenPackages = getModulePackages(reader.getOpenModulePackages());
+            EconomicMap<String, Map<String, Set<String>>> moduleExportedPackages = getModulePackages(reader.getExportedModulePackages());
 
             return new HostedLayeredModuleSingleton(moduleOpenPackages, moduleExportedPackages);
         }

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ModuleLayerFeature.java

@@ -219,7 +219,8 @@ static class LayerPackagesTransformer implements FieldValueTransformer {
         @Override
         public Object transform(Object receiver, Object originalValue) {
             Module module = (Module) receiver;
-            if (!LayeredModuleSingleton.singleton().getModules().contains(GraalAccess.lookupModule(module))) {
+
+            if (!LayeredModuleSingleton.singleton().containsModule(GraalAccess.lookupModule(module))) {
                 /*
                  * Modules that are not processed by the LayeredModuleSingleton don't need to be
                  * delayed until the application layer.