Distinguish resources with actual content vs resources where only the

access has been registered.

Author: thomaswue

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

@@ -219,9 +219,10 @@ public String getModuleName() {
     }
 
     /**
-     * The object used to mark a resource as reachable according to the metadata. It can be obtained
-     * when accessing the {@link Resources#resources} map, and it means that even though the
-     * resource was correctly specified in the configuration, accessing it will return null.
+     * A resource marked with the NEGATIVE_QUERY_MARKER is a resource included in the image
+     * according to the resource configuration, but it does not actually exist. Trying to access it
+     * at runtime will return {@code null} and not throw a
+     * {@link com.oracle.svm.core.jdk.resources.MissingResourceRegistrationError}.
      */
     public static final ResourceStorageEntryBase NEGATIVE_QUERY_MARKER = new ResourceStorageEntryBase();
 
@@ -231,7 +232,7 @@ public String getModuleName() {
      * correctly specified in the configuration, but we do not want to throw directly (for example
      * when we try to check all the modules for a resource).
      */
-    private static final ResourceStorageEntryBase MISSING_METADATA_MARKER = new ResourceStorageEntryBase();
+    public static final ResourceStorageEntryBase MISSING_METADATA_MARKER = new ResourceStorageEntryBase();
 
     /**
      * Embedding a resource into an image is counted as a modification. Since all resources are

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/resources/ResourceStorageEntry.java

@@ -35,7 +35,7 @@
 
 public final class ResourceStorageEntry extends ResourceStorageEntryBase {
 
-    private static byte[][] EMPTY_DATA = new byte[0][];
+    private static final byte[][] EMPTY_DATA = new byte[0][];
 
     private final boolean isDirectory;
     private final boolean fromJar;

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

@@ -522,7 +522,7 @@ private void printAnalysisStatistics(AnalysisUniverse universe, Collection<Strin
             }
         }
         if (resourceCount > 0) {
-            l().a("%,9d %s found with %s total size", resourceCount, resourceCount == 1 ? "resource" : "resources", ByteFormattingUtil.bytesToHuman(totalResourceSize)).println();
+            l().a("%,9d %s registered with %s total size", resourceCount, resourceCount == 1 ? "resource access" : "resource accesses", ByteFormattingUtil.bytesToHuman(totalResourceSize)).println();
         }
         int numLibraries = libraries.size();
         if (numLibraries > 0) {
@@ -592,10 +592,15 @@ public void printCreationEnd(int imageFileSize, int heapObjectCount, long imageH
         String format = "%9s (%5.2f%%) for ";
         l().a(format, ByteFormattingUtil.bytesToHuman(codeAreaSize), Utils.toPercentage(codeAreaSize, imageFileSize))
                         .doclink("code area", "#glossary-code-area").a(":%,10d compilation units", numCompilations).println();
-        int numResources = Resources.currentLayer().resources().size();
+        int numResources = 0;
+        for (ConditionalRuntimeValue<ResourceStorageEntryBase> entry : Resources.currentLayer().resources().getValues()) {
+            if (entry.getValueUnconditionally() != Resources.NEGATIVE_QUERY_MARKER && entry.getValueUnconditionally() != Resources.MISSING_METADATA_MARKER) {
+                numResources++;
+            }
+        }
         recordJsonMetric(ImageDetailKey.IMAGE_HEAP_RESOURCE_COUNT, numResources);
         l().a(format, ByteFormattingUtil.bytesToHuman(imageHeapSize), Utils.toPercentage(imageHeapSize, imageFileSize))
-                        .doclink("image heap", "#glossary-image-heap").a(":%,9d objects and %,d resources", heapObjectCount, numResources).println();
+                        .doclink("image heap", "#glossary-image-heap").a(":%,9d objects and %,d resource%s", heapObjectCount, numResources, numResources == 1 ? "" : "s").println();
         long otherBytes = imageFileSize - codeAreaSize - imageHeapSize;
         if (debugInfoSize > 0) {
             recordJsonMetric(ImageDetailKey.DEBUG_INFO_SIZE, debugInfoSize); // Optional metric