[GR-47406] Correctly handle printing certain JSON values in agent trace files.

PullRequest: graal/15884

Author: peter-hofer

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

@@ -99,13 +99,13 @@ private static void printArray(JsonWriter json, Object[] array) throws IOExcepti
     }
 
     private static void printValue(JsonWriter json, Object value) throws IOException {
-        String s = null;
+        Object s = null;
         if (value instanceof byte[]) {
             s = Base64.getEncoder().encodeToString((byte[]) value);
         } else if (value != null) {
-            s = value.toString();
+            s = value;
         }
-        json.quote(s);
+        json.printValue(s);
     }
 
     private void traceEntry(String s) throws IOException {

substratevm/src/com.oracle.svm.configure/src/com/oracle/svm/configure/command/ConfigurationGenerateCommand.java

@@ -146,6 +146,7 @@ protected static void generate(Iterator<String> argumentsIterator, boolean accep
         boolean builtinCallerFilter = true;
         boolean builtinHeuristicFilter = true;
         List<URI> callerFilters = new ArrayList<>();
+        List<URI> accessFilters = new ArrayList<>();
 
         ConfigurationFileCollection omittedCollection = new ConfigurationFileCollection();
         ConfigurationFileCollection inputCollection = new ConfigurationFileCollection();
@@ -220,6 +221,9 @@ protected static void generate(Iterator<String> argumentsIterator, boolean accep
                 case "--caller-filter-file":
                     callerFilters.add(requirePathUri(option, value));
                     break;
+                case "--access-filter-file":
+                    accessFilters.add(requirePathUri(option, value));
+                    break;
                 case "--":
                     if (acceptTraceFileArgs) {
                         argumentsIterator.forEachRemaining(arg -> traceInputs.add(Paths.get(arg).toUri()));
@@ -248,15 +252,12 @@ protected static void generate(Iterator<String> argumentsIterator, boolean accep
                 callersFilterHierarchyFilterNode = AccessAdvisor.copyBuiltinCallerFilterTree();
                 callersFilter = new ComplexFilter(callersFilterHierarchyFilterNode);
             }
-            for (URI uri : callerFilters) {
-                try {
-                    FilterConfigurationParser parser = new FilterConfigurationParser(callersFilter);
-                    parser.parseAndRegister(uri);
-                } catch (Exception e) {
-                    throw new ConfigurationUsageException("Cannot parse filter file " + uri + ": " + e);
-                }
-            }
-            callersFilter.getHierarchyFilterNode().removeRedundantNodes();
+            parseFilterFiles(callersFilter, callerFilters);
+        }
+        ComplexFilter accessFilter = null;
+        if (!accessFilters.isEmpty()) {
+            accessFilter = new ComplexFilter(AccessAdvisor.copyBuiltinAccessFilterTree());
+            parseFilterFiles(accessFilter, accessFilters);
         }
 
         ConfigurationSet configurationSet;
@@ -287,6 +288,9 @@ protected static void generate(Iterator<String> argumentsIterator, boolean accep
             if (callersFilter != null) {
                 advisor.setCallerFilterTree(callersFilter);
             }
+            if (accessFilter != null) {
+                advisor.setAccessFilterTree(accessFilter);
+            }
 
             TraceProcessor processor = new TraceProcessor(advisor);
             for (URI uri : traceInputs) {
@@ -331,6 +335,17 @@ protected static void generate(Iterator<String> argumentsIterator, boolean accep
         }
     }
 
+    private static void parseFilterFiles(ComplexFilter filter, List<URI> filterFiles) {
+        for (URI uri : filterFiles) {
+            try {
+                new FilterConfigurationParser(filter).parseAndRegister(uri);
+            } catch (Exception e) {
+                throw new ConfigurationUsageException("Cannot parse filter file " + uri + ": " + e);
+            }
+        }
+        filter.getHierarchyFilterNode().removeRedundantNodes();
+    }
+
     @SuppressWarnings("fallthrough")
     private static void failIfAgentLockFilesPresent(ConfigurationFileCollection... collections) {
         Set<String> paths = null;

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/json/JsonWriter.java

@@ -82,20 +82,21 @@ public JsonWriter appendFieldSeparator() throws IOException {
     }
 
     public JsonWriter appendKeyValue(String key, Object value) throws IOException {
-        return quote(key).appendFieldSeparator().quote(value);
+        return quote(key).appendFieldSeparator().printValue(value);
     }
 
     @SuppressWarnings({"unchecked", "rawtypes"})
-    public void print(Object value) throws IOException {
+    public JsonWriter print(Object value) throws IOException {
         if (value instanceof Map map) {
             printMap(map); // Must always be <String, Object>
         } else if (value instanceof Iterator it) {
             printIterator(it);
         } else if (value instanceof List list) {
             printIterator(list.iterator());
         } else {
-            quote(value);
+            printValue(value);
         }
+        return this;
     }
 
     @SuppressWarnings("unchecked")
@@ -130,15 +131,26 @@ private void printIterator(Iterator<?> iter) throws IOException {
         append(']');
     }
 
-    public JsonWriter quote(Object o) throws IOException {
+    public JsonWriter printValue(Object o) throws IOException {
         if (o == null) {
             return append("null");
-        } else if (Boolean.TRUE.equals(o)) {
-            return append("true");
-        } else if (Boolean.FALSE.equals(o)) {
-            return append("false");
-        } else if (o instanceof Number) {
+        } else if (o instanceof Boolean || o instanceof Byte || o instanceof Short || o instanceof Integer || o instanceof Long) {
+            /*
+             * Note that sub-integer values here most likely become Integer objects when parsing,
+             * and comparisons such as equals() or compareTo() on boxed values only work on the
+             * exact same type. (Boolean values, however, should be deserialized as Boolean).
+             */
             return append(o.toString());
+        } else if (o instanceof Float f) {
+            if (f.isNaN() || f.isInfinite()) {
+                return quote(f.toString()); // cannot express, best we can do without failing
+            }
+            return append(f.toString());
+        } else if (o instanceof Double d) {
+            if (d.isNaN() || d.isInfinite()) {
+                return quote(d.toString()); // cannot express, best we can do without failing
+            }
+            return append(d.toString());
         } else {
             return quote(o.toString());
         }

substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/BundleSupport.java

@@ -860,8 +860,8 @@ private static Manifest createManifest() {
     private static final String substitutionMapDstField = "dst";
 
     private static void printPathMapping(Map.Entry<Path, Path> entry, JsonWriter w) throws IOException {
-        w.append('{').quote(substitutionMapSrcField).append(':').quote(entry.getKey());
-        w.append(',').quote(substitutionMapDstField).append(':').quote(entry.getValue());
+        w.append('{').quote(substitutionMapSrcField).append(':').printValue(entry.getKey());
+        w.append(',').quote(substitutionMapDstField).append(':').printValue(entry.getValue());
         w.append('}');
     }
 

substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/ImageHeapConnectedComponentsPrinter.java

@@ -216,7 +216,7 @@ public void printSummaryInfoForEveryObjectInConnectedComponents(PrintWriter out)
             for (Iterator<ConnectedComponent> iterator = connectedComponents.iterator(); iterator.hasNext();) {
                 ConnectedComponent connectedComponent = iterator.next();
                 writer.append('{').newline();
-                writer.quote("componentId").append(':').quote(connectedComponent.getId()).append(',').newline();
+                writer.quote("componentId").append(':').printValue(connectedComponent.getId()).append(',').newline();
                 writer.quote("sizeInBytes").append(':').append(String.valueOf(connectedComponent.getSizeInBytes())).append(',').newline();
                 writer.quote("objects").append(":[");
                 List<ObjectInfo> objects = connectedComponent.getObjects();