Add debug tracing using debug-log

Author: DSouzaM

substratevm/src/com.oracle.svm.agent/src/com/oracle/svm/agent/tracing/TraceFileWriter.java

@@ -31,7 +31,7 @@
 
 import com.oracle.svm.agent.tracing.core.Tracer;
 import com.oracle.svm.agent.tracing.core.TracingResultWriter;
-import com.oracle.svm.configure.trace.JsonFileWriter;
+import com.oracle.svm.configure.JsonFileWriter;
 
 public class TraceFileWriter extends Tracer implements TracingResultWriter {
     private final JsonFileWriter jsonFileWriter;

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/JsonFileWriter.java renamed to substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/JsonFileWriter.java

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.configure.trace;
+package com.oracle.svm.configure;
 
 import java.io.BufferedWriter;
 import java.io.Closeable;
@@ -97,6 +97,10 @@ private static void printArray(JsonWriter json, Object[] array) throws IOExcepti
     }
 
     private static void printValue(JsonWriter json, Object value) throws IOException {
+        if (value instanceof JsonPrintable printable) {
+            printable.printJson(json);
+            return;
+        }
         Object s = null;
         if (value instanceof byte[]) {
             s = Base64.getEncoder().encodeToString((byte[]) value);

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

@@ -465,10 +465,18 @@ public synchronized void setAllPublicConstructors(ConfigurationMemberAccessibili
         }
     }
 
+    public synchronized boolean isSerializable() {
+        return serializable;
+    }
+
     public synchronized void setSerializable() {
         serializable = true;
     }
 
+    public synchronized boolean isJniAccessible() {
+        return typeJniAccessible;
+    }
+
     public synchronized void setJniAccessible() {
         typeJniAccessible = true;
     }

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/trace/AccessAdvisor.java

@@ -31,6 +31,7 @@
 
 import org.graalvm.collections.EconomicMap;
 
+import com.oracle.svm.configure.JsonFileWriter;
 import com.oracle.svm.configure.filters.ConfigurationFilter;
 import com.oracle.svm.configure.filters.HierarchyFilterNode;
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/ClassForNameSupport.java

@@ -47,7 +47,6 @@
 import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 import com.oracle.svm.configure.ClassNameSupport;
-import com.oracle.svm.configure.config.ConfigurationType;
 import com.oracle.svm.core.configure.ConditionalRuntimeValue;
 import com.oracle.svm.core.configure.RuntimeConditionSet;
 import com.oracle.svm.core.feature.AutomaticallyRegisteredImageSingleton;
@@ -502,10 +501,7 @@ public static Throwable getSavedException(String className) {
     public static boolean canUnsafeInstantiateAsInstance(DynamicHub hub) {
         Class<?> clazz = DynamicHub.toClass(hub);
         if (MetadataTracer.enabled()) {
-            ConfigurationType type = MetadataTracer.singleton().traceReflectionType(clazz.getTypeName());
-            if (type != null) {
-                type.setUnsafeAllocated();
-            }
+            MetadataTracer.singleton().traceUnsafeAllocatedType(clazz.getTypeName());
         }
         RuntimeConditionSet conditionSet = null;
         for (var singleton : layeredSingletons()) {

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/hub/DynamicHub.java

@@ -786,7 +786,7 @@ private static boolean isClassFlagSet(int mask, ReflectionMetadata reflectionMet
     }
 
     private void traceClassFlagQuery(int mask) {
-        ConfigurationType type = MetadataTracer.singleton().traceReflectionType(getTypeName());
+        ConfigurationType type = MetadataTracer.singleton().traceReflectionTypeImpl(getTypeName());
         if (type == null) {
             return;
         }
@@ -1397,18 +1397,12 @@ private void traceFieldLookup(String fieldName, Field field, boolean publicOnly)
         ConfigurationMemberDeclaration declaration = publicOnly ? ConfigurationMemberDeclaration.PRESENT : ConfigurationMemberDeclaration.DECLARED;
         if (field != null) {
             // register declaring type and field
-            ConfigurationType declaringType = MetadataTracer.singleton().traceReflectionType(field.getDeclaringClass().getTypeName());
-            if (declaringType != null) {
-                declaringType.addField(fieldName, declaration, false);
-            }
+            MetadataTracer.singleton().traceField(field.getDeclaringClass().getTypeName(), fieldName, declaration);
             // register receiver type
             MetadataTracer.singleton().traceReflectionType(getTypeName());
         } else {
             // register receiver type and negative field query
-            ConfigurationType receiverType = MetadataTracer.singleton().traceReflectionType(getTypeName());
-            if (receiverType != null) {
-                receiverType.addField(fieldName, declaration, false);
-            }
+            MetadataTracer.singleton().traceField(getTypeName(), fieldName, declaration);
         }
     }
 
@@ -1482,18 +1476,13 @@ private void traceMethodLookup(String methodName, Class<?>[] parameterTypes, Exe
         ConfigurationMemberDeclaration declaration = publicOnly ? ConfigurationMemberDeclaration.PRESENT : ConfigurationMemberDeclaration.DECLARED;
         if (method != null) {
             // register declaring type and method
-            ConfigurationType declaringType = MetadataTracer.singleton().traceReflectionType(method.getDeclaringClass().getTypeName());
-            if (declaringType != null) {
-                declaringType.addMethod(methodName, toInternalSignature(parameterTypes), declaration);
-            }
+            // TODO (GR-64765) loosen to queried accessibility once method invocations are traced
+            MetadataTracer.singleton().traceMethod(method.getDeclaringClass().getTypeName(), methodName, toInternalSignature(parameterTypes), declaration, ConfigurationMemberAccessibility.ACCESSED);
             // register receiver type
             MetadataTracer.singleton().traceReflectionType(getTypeName());
         } else {
             // register receiver type and negative method query
-            ConfigurationType receiverType = MetadataTracer.singleton().traceReflectionType(getTypeName());
-            if (receiverType != null) {
-                receiverType.addMethod(methodName, toInternalSignature(parameterTypes), declaration, ConfigurationMemberAccessibility.QUERIED);
-            }
+            MetadataTracer.singleton().traceMethod(getTypeName(), methodName, toInternalSignature(parameterTypes), declaration, ConfigurationMemberAccessibility.QUERIED);
         }
     }
 

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jni/access/JNIReflectionDictionary.java

@@ -43,7 +43,6 @@
 
 import com.oracle.svm.configure.ClassNameSupport;
 import com.oracle.svm.configure.config.ConfigurationMemberInfo;
-import com.oracle.svm.configure.config.ConfigurationType;
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.Uninterruptible;
 import com.oracle.svm.core.heap.Heap;
@@ -274,10 +273,10 @@ public static JNIMethodId getDeclaredMethodID(Class<?> classObject, JNIAccessibl
 
     private static JNIAccessibleMethod getDeclaredMethod(Class<?> classObject, JNIAccessibleMethodDescriptor descriptor, String dumpLabel) {
         if (MetadataTracer.enabled()) {
-            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getTypeName());
-            if (clazzType != null) {
-                clazzType.addMethod(descriptor.getNameConvertToString(), descriptor.getSignatureConvertToString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED);
-            }
+            MetadataTracer.singleton().traceJNIType(classObject.getTypeName());
+            // TODO (GR-64765) loosen to queried accessibility once method invocations are traced
+            MetadataTracer.singleton().traceMethod(classObject.getTypeName(), descriptor.getNameConvertToString(), descriptor.getSignatureConvertToString(),
+                            ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED, ConfigurationMemberInfo.ConfigurationMemberAccessibility.ACCESSED);
         }
         boolean foundClass = false;
         for (var dictionary : layeredSingletons()) {
@@ -335,10 +334,8 @@ private static JNIAccessibleMethod checkMethod(JNIAccessibleMethod method, Class
 
     private static JNIAccessibleField getDeclaredField(Class<?> classObject, CharSequence name, boolean isStatic, String dumpLabel) {
         if (MetadataTracer.enabled()) {
-            ConfigurationType clazzType = MetadataTracer.singleton().traceJNIType(classObject.getTypeName());
-            if (clazzType != null) {
-                clazzType.addField(name.toString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED, false);
-            }
+            MetadataTracer.singleton().traceJNIType(classObject.getTypeName());
+            MetadataTracer.singleton().traceField(classObject.getTypeName(), name.toString(), ConfigurationMemberInfo.ConfigurationMemberDeclaration.DECLARED);
         }
         boolean foundClass = false;
         for (var dictionary : layeredSingletons()) {