Cleanup

Author: Aleksandar Gradinac

substratevm/mx.substratevm/mx_substratevm.py

@@ -450,7 +450,7 @@ def conditional_config_task(native_image):
     config_dir = join(svmbuild_dir(), 'cond-config-test-config')
     if exists(config_dir):
         mx.rmtree(config_dir)
-    agent_opts = ['config-output-dir=' + config_dir, 'experimental-conditional-configuration=com.oracle.svm.configure.test.conditionalconfig']
+    agent_opts = ['config-output-dir=' + config_dir, 'experimental-conditional-configuration-for-packages=com.oracle.svm.configure.test.conditionalconfig']
     jvm_unittest(['-agentpath:' + agent_path + '=' + ','.join(agent_opts)]
                  + ['com.oracle.svm.configure.test.conditionalconfig.ConfigurationGenerator'])
 

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgent.java

@@ -124,8 +124,8 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
         boolean experimentalOmitClasspathConfig = false;
         boolean build = false;
         boolean configurationWithOrigins = false;
-        Set<String> predefinedConfigurationPackages = new HashSet<>();
-        Set<Pattern> classNamePatterns = new HashSet<>();
+        Set<String> conditionalConfigurationUserCodePackagePrefixes = new HashSet<>();
+        Set<Pattern> conditionalConfigurationClassNameExcludePatterns = new HashSet<>();
         int configWritePeriod = -1; // in seconds
         int configWritePeriodInitialDelay = 1; // in seconds
         boolean trackReflectionMetadata = true;
@@ -197,12 +197,12 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
                 build = Boolean.parseBoolean(getTokenValue(token));
             } else if (token.equals("experimental-configuration-with-origins")) {
                 configurationWithOrigins = true;
-            } else if (token.startsWith("experimental-conditional-configuration=")) {
-                String applicationPackages = getTokenValue(token);
-                Collections.addAll(predefinedConfigurationPackages, applicationPackages.split(","));
-            } else if (token.startsWith("class-name-filter=")) {
+            } else if (token.startsWith("experimental-conditional-configuration-for-packages=")) {
+                String userPackagePrefixes = getTokenValue(token);
+                Collections.addAll(conditionalConfigurationUserCodePackagePrefixes, userPackagePrefixes.split(","));
+            } else if (token.startsWith("conditional-configuration-class-name-exclude-patterns=")) {
                 String classNamePattern = getTokenValue(token);
-                Arrays.stream(classNamePattern.split(",")).map(Pattern::compile).forEach(classNamePatterns::add);
+                Arrays.stream(classNamePattern.split(",")).map(Pattern::compile).forEach(conditionalConfigurationClassNameExcludePatterns::add);
             } else if (token.equals("track-reflection-metadata")) {
                 trackReflectionMetadata = true;
             } else if (token.startsWith("track-reflection-metadata=")) {
@@ -217,7 +217,7 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
             inform("no output/build options provided, tracking dynamic accesses and writing configuration to directory: " + configOutputDir);
         }
 
-        if (configurationWithOrigins && !predefinedConfigurationPackages.isEmpty()) {
+        if (configurationWithOrigins && !conditionalConfigurationUserCodePackagePrefixes.isEmpty()) {
             return error(5, "The agent can only be used in either the configuration with origins mode or the predefined classes mode.");
         }
 
@@ -252,7 +252,7 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
             }
         }
 
-        boolean shouldTraceOriginInformation = configurationWithOrigins || !predefinedConfigurationPackages.isEmpty();
+        boolean shouldTraceOriginInformation = configurationWithOrigins || !conditionalConfigurationUserCodePackagePrefixes.isEmpty();
         final MethodInfoRecordKeeper recordKeeper = new MethodInfoRecordKeeper(shouldTraceOriginInformation);
         final Supplier<InterceptedState> interceptedStateSupplier = shouldTraceOriginInformation ? EagerlyLoadedJavaStackAccess.stackAccessSupplier()
                         : OnDemandJavaStackAccess.stackAccessSupplier();
@@ -288,9 +288,9 @@ protected int onLoadCallback(JNIJavaVM vm, JvmtiEnv jvmti, JvmtiEventCallbacks c
                     ConfigurationWithOriginsResultWriter writer = new ConfigurationWithOriginsResultWriter(advisor, recordKeeper);
                     tracer = writer;
                     tracingResultWriter = writer;
-                } else if (!predefinedConfigurationPackages.isEmpty()) {
-                    ConditionalConfigurationPredicate filter = new ConditionalConfigurationPredicate(classNamePatterns);
-                    ConditionalConfigurationWriter writer = new ConditionalConfigurationWriter(advisor, recordKeeper, predefinedConfigurationPackages, filter);
+                } else if (!conditionalConfigurationUserCodePackagePrefixes.isEmpty()) {
+                    ConditionalConfigurationPredicate filter = new ConditionalConfigurationPredicate(conditionalConfigurationClassNameExcludePatterns);
+                    ConditionalConfigurationWriter writer = new ConditionalConfigurationWriter(advisor, recordKeeper, conditionalConfigurationUserCodePackagePrefixes, filter);
                     tracer = writer;
                     tracingResultWriter = writer;
                 } else {

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/NativeImageAgentJNIHandleSet.java

@@ -26,8 +26,6 @@
 
 import static com.oracle.svm.jni.JNIObjectHandles.nullHandle;
 
-import com.oracle.svm.jvmtiagentbase.Support;
-import jdk.vm.ci.meta.MetaUtil;
 import org.graalvm.word.WordFactory;
 
 import com.oracle.svm.jni.nativeapi.JNIEnvironment;
@@ -230,37 +228,4 @@ public JNIMethodId getJavaUtilResourceBundleGetLocale(JNIEnvironment env) {
         }
         return javaUtilResourceBundleGetLocale;
     }
-
-    private JNIMethodId javaLangClassGetProtectionDomain = WordFactory.nullPointer();
-    private JNIMethodId javaSecurityProtectionDomainGetCodeSource = WordFactory.nullPointer();
-    private JNIMethodId javaSecurityCodeSourceGetLocation = WordFactory.nullPointer();
-    private JNIMethodId javaNetURLGetPath = WordFactory.nullPointer();
-
-    public String getClassLocationOrNull(JNIEnvironment env, String className) {
-        String classNameInternal = MetaUtil.toInternalName(className);
-        JNIObjectHandle clazz = findClass(env, classNameInternal);
-        if (clazz == null) {
-            return null;
-        }
-
-        if (javaLangClassGetProtectionDomain.isNull()) {
-            javaLangClassGetProtectionDomain = getMethodId(env, javaLangClass, "getProtectionDomain", "()Ljava/security/ProtectionDomain;", false);
-
-            JNIObjectHandle protDomainClass = findClass(env, "java/security/ProtectionDomain");
-            javaSecurityProtectionDomainGetCodeSource = getMethodId(env, protDomainClass, "getCodeSource", "()Ljava/security/CodeSource;", false);
-
-            JNIObjectHandle codeSourceClass = findClass(env, "java/security/CodeSource");
-            javaSecurityCodeSourceGetLocation = getMethodId(env, codeSourceClass, "getLocation", "()Ljava/net/URL;", false);
-
-            JNIObjectHandle urlClass = findClass(env, "java/net/URL");
-            javaNetURLGetPath = getMethodId(env, urlClass, "getPath", "()Ljava/lang/String;", false);
-        }
-
-        /* return clazz.getProtectionDomain().getCodeSource().getLocation().getPath() */
-        JNIObjectHandle protectionDomain = Support.callObjectMethod(env, clazz, javaLangClassGetProtectionDomain);
-        JNIObjectHandle codeSource = Support.callObjectMethod(env, protectionDomain, javaSecurityProtectionDomainGetCodeSource);
-        JNIObjectHandle location = Support.callObjectMethod(env, codeSource, javaSecurityCodeSourceGetLocation);
-        JNIObjectHandle path = Support.callObjectMethod(env, location, javaNetURLGetPath);
-        return Support.fromJniString(env, path);
-    }
 }

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/predicatedconfig/ConditionalConfigurationWriter.java

@@ -187,22 +187,22 @@ private void deduceConditionalConfiguration(Map<MethodInfo, List<CallNodeWithCon
 
     private void addConfigurationWithCondition(ConfigurationSet nodeConfig, ConfigurationCondition condition) {
         TypeConfiguration reflectionConfig = nodeConfig.getReflectionConfiguration();
-        configurationContainer.getReflectionConfiguration().addWithCondition(condition, reflectionConfig);
+        configurationContainer.getReflectionConfiguration().mergeConditional(condition, reflectionConfig);
 
         TypeConfiguration jniConfig = nodeConfig.getJniConfiguration();
-        configurationContainer.getJniConfiguration().addWithCondition(condition, jniConfig);
+        configurationContainer.getJniConfiguration().mergeConditional(condition, jniConfig);
 
         ResourceConfiguration resourceConfiguration = nodeConfig.getResourceConfiguration();
-        configurationContainer.getResourceConfiguration().addWithCondition(condition, resourceConfiguration);
+        configurationContainer.getResourceConfiguration().mergeConditional(condition, resourceConfiguration);
 
         ProxyConfiguration proxyConfiguration = nodeConfig.getProxyConfiguration();
-        configurationContainer.getProxyConfiguration().addWithCondition(condition, proxyConfiguration);
+        configurationContainer.getProxyConfiguration().mergeConditional(condition, proxyConfiguration);
 
         SerializationConfiguration serializationConfiguration = nodeConfig.getSerializationConfiguration();
-        configurationContainer.getSerializationConfiguration().addWithCondition(condition, serializationConfiguration);
+        configurationContainer.getSerializationConfiguration().mergeConditional(condition, serializationConfiguration);
 
         PredefinedClassesConfiguration predefinedClassesConfiguration = nodeConfig.getPredefinedClassesConfiguration();
-        configurationContainer.getPredefinedClassesConfiguration().addWithCondition(condition, predefinedClassesConfiguration);
+        configurationContainer.getPredefinedClassesConfiguration().mergeConditional(condition, predefinedClassesConfiguration);
     }
 
     private void filterConfiguration() {
@@ -234,29 +234,22 @@ protected String getConfigFileSuffix() {
     private boolean methodOriginatesFromApplicationPackage(MethodInfo methodInfo) {
         return applicationPackagePrefixes.stream().anyMatch(prefix -> methodInfo.getJavaDeclaringClassName().startsWith(prefix));
     }
-
-    private int findIndexOfMethodFromApplicationPackage(MethodInfo[] stackTrace, boolean fromBeginning) {
-        int firstMethodOriginatingInPackage = fromBeginning ? 0 : stackTrace.length - 1;
-        int step = fromBeginning ? 1 : -1;
-        while (firstMethodOriginatingInPackage >= 0 && firstMethodOriginatingInPackage < stackTrace.length) {
-            if (methodOriginatesFromApplicationPackage(stackTrace[firstMethodOriginatingInPackage])) {
-                return firstMethodOriginatingInPackage;
-            }
-            firstMethodOriginatingInPackage = firstMethodOriginatingInPackage + step;
-        }
-        return -1;
-    }
-
     @Override
     protected MethodInfo[] filterStackTrace(MethodInfo[] stackTrace) {
         /* Keep only the classes from the selected package names on the stack trace. */
-        int firstMethodIndex = findIndexOfMethodFromApplicationPackage(stackTrace, true);
-        if (firstMethodIndex == -1) {
+        int dest = 0;
+        for (int i = 0; i < stackTrace.length; ++i) {
+            if (methodOriginatesFromApplicationPackage(stackTrace[i])) {
+                stackTrace[dest++] = stackTrace[i];
+            }
+        }
+
+        /* No classes on this trace originated from user code */
+        if (dest == 0) {
             return null;
         }
-        int lastMethodIndex = findIndexOfMethodFromApplicationPackage(stackTrace, false);
 
-        return Arrays.copyOfRange(stackTrace, firstMethodIndex, lastMethodIndex);
+        return Arrays.copyOfRange(stackTrace, 0, dest);
     }
 
     @Override

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/ConfigurationBase.java

@@ -27,6 +27,7 @@
 import java.util.function.Consumer;
 
 import com.oracle.svm.configure.json.JsonPrintable;
+import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 public abstract class ConfigurationBase<T extends ConfigurationBase<T, P>, P> implements JsonPrintable {
 
@@ -36,6 +37,8 @@ public abstract class ConfigurationBase<T extends ConfigurationBase<T, P>, P> im
 
     protected abstract void merge(T other);
 
+    protected abstract void mergeConditional(ConfigurationCondition condition, T other);
+
     protected abstract void subtract(T other);
 
     protected abstract void intersect(T other);

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ConfigurationType.java

@@ -210,9 +210,7 @@ private void intersectFields(ConfigurationType other) {
         if (fields != null) {
             if (other.fields != null) {
                 fields.keySet().retainAll(other.fields.keySet());
-                for (Map.Entry<String, FieldInfo> fieldEntry : other.fields.entrySet()) {
-                    fields.computeIfPresent(fieldEntry.getKey(), (key, value) -> value.newIntersectedWith(fieldEntry.getValue()));
-                }
+                fields.replaceAll((key, value) -> value.newIntersectedWith(other.fields.get(key)));
             } else {
                 fields = null;
             }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/PredefinedClassesConfiguration.java

@@ -75,15 +75,16 @@ protected void subtract(PredefinedClassesConfiguration other) {
 
     @Override
     protected void intersect(PredefinedClassesConfiguration other) {
-        classes.keySet().retainAll(classes.keySet());
+        classes.keySet().retainAll(other.classes.keySet());
     }
 
     @Override
     protected void removeIf(Predicate predicate) {
         classes.values().removeIf(predicate::testPredefinedClass);
     }
 
-    public void addWithCondition(ConfigurationCondition condition, PredefinedClassesConfiguration other) {
+    @Override
+    public void mergeConditional(ConfigurationCondition condition, PredefinedClassesConfiguration other) {
         /* Not implemented with conditions yet */
         classes.putAll(other.classes);
     }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ProxyConfiguration.java

@@ -76,7 +76,8 @@ public void subtract(ProxyConfiguration other) {
         interfaceLists.removeAll(other.interfaceLists);
     }
 
-    public void addWithCondition(ConfigurationCondition condition, ProxyConfiguration other) {
+    @Override
+    public void mergeConditional(ConfigurationCondition condition, ProxyConfiguration other) {
         for (ConditionalElement<List<String>> interfaceList : other.interfaceLists) {
             add(condition, new ArrayList<>(interfaceList.getElement()));
         }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/ResourceConfiguration.java

@@ -146,7 +146,8 @@ protected void removeIf(Predicate predicate) {
         bundles.entrySet().removeIf(entry -> predicate.testIncludedBundle(entry.getKey(), entry.getValue()));
     }
 
-    public void addWithCondition(ConfigurationCondition condition, ResourceConfiguration other) {
+    @Override
+    public void mergeConditional(ConfigurationCondition condition, ResourceConfiguration other) {
         for (Map.Entry<ConditionalElement<String>, Pattern> entry : other.addedResources.entrySet()) {
             addedResources.put(new ConditionalElement<>(condition, entry.getKey().getElement()), entry.getValue());
         }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/config/SerializationConfiguration.java

@@ -75,7 +75,8 @@ protected void removeIf(Predicate predicate) {
         serializations.removeIf(predicate::testSerializationType);
     }
 
-    public void addWithCondition(ConfigurationCondition condition, SerializationConfiguration other) {
+    @Override
+    public void mergeConditional(ConfigurationCondition condition, SerializationConfiguration other) {
         for (SerializationConfigurationType type : other.serializations) {
             serializations.add(new SerializationConfigurationType(condition, type.getQualifiedJavaName(), type.getQualifiedCustomTargetConstructorJavaName()));
         }