Do not print location info in Top 10 printing

Author: olpaw

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

@@ -225,7 +225,7 @@ public static HeapBreakdownEntry of(String prefix, String name, String htmlAncho
             return new HeapBreakdownEntryFixed(new LinkyHeapObjectKindName(prefix, name, htmlAnchor));
         }
 
-        public abstract HeapBreakdownLabel getLabel(boolean truncate);
+        public abstract HeapBreakdownLabel getLabel(int maxLength);
 
         public long getByteSize() {
             return byteSize;
@@ -259,7 +259,7 @@ static class HeapBreakdownEntryFixed extends HeapBreakdownEntry {
         }
 
         @Override
-        public HeapBreakdownLabel getLabel(boolean unused) {
+        public HeapBreakdownLabel getLabel(int unused) {
             return label;
         }
     }
@@ -273,10 +273,12 @@ static class HeapBreakdownEntryForClass extends HeapBreakdownEntry {
         }
 
         @Override
-        public HeapBreakdownLabel getLabel(boolean truncate) {
-            if (truncate) {
-                return new SimpleHeapObjectKindName(ProgressReporterUtils.moduleNamePrefix(clazz.getModule()) +
-                                ProgressReporterUtils.truncateFQN(clazz.getTypeName(), 0.29));
+        public HeapBreakdownLabel getLabel(int maxLength) {
+            if (maxLength >= 0) {
+                String moduleNamePrefix = ProgressReporterUtils.moduleNamePrefix(clazz.getModule());
+                int maxLengthClassName = maxLength - moduleNamePrefix.length();
+                String truncatedClassName = ProgressReporterUtils.truncateFQN(clazz.getTypeName(), maxLengthClassName);
+                return new SimpleHeapObjectKindName(moduleNamePrefix + truncatedClassName);
             } else {
                 return new SimpleHeapObjectKindName(clazz.getTypeName());
             }

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

@@ -684,23 +684,24 @@ private void printBreakdowns() {
         Iterator<HeapBreakdownProvider.HeapBreakdownEntry> typesBySizeInHeap = heapBreakdown.getSortedBreakdownEntries().iterator();
         for (int i = 0; i < MAX_NUM_BREAKDOWN; i++) {
             String codeSizePart = "";
-            /* <- 10% for module name -><- remainder for class FQN -><- 10% for location -> */
+            /* <- 12% for module name -><- remainder for package FQN -> */
             if (packagesBySize.hasNext()) {
                 Entry<ProgressReporterUtils.BreakDownClassifier, Long> entry = packagesBySize.next();
-                String sizeStr = String.format("%9s ", ByteFormattingUtil.bytesToHuman(entry.getValue()));
+                String sizeStr = getBreakdownSizeString(entry.getValue());
                 String entryStr = entry.getKey().renderToString(p.middle() - sizeStr.length());
                 codeSizePart = sizeStr + entryStr;
                 printedCodeBytes += entry.getValue();
                 printedCodeItems++;
             }
 
             String heapSizePart = "";
-            /* <- 10% for module name -><- 29% for class FQN -> */
+            /* <- 12% for module name -><- remainder for class FQN -> */
             if (typesBySizeInHeap.hasNext()) {
                 HeapBreakdownProvider.HeapBreakdownEntry e = typesBySizeInHeap.next();
-                String labelString = e.getLabel(true).renderToString(linkStrategy);
                 long byteSize = e.byteSize;
-                heapSizePart = String.format("%9s %s", ByteFormattingUtil.bytesToHuman(byteSize), labelString);
+                String sizeStr = getBreakdownSizeString(byteSize);
+                String labelStr = e.getLabel(CHARACTERS_PER_LINE - p.middle() - sizeStr.length()).renderToString(linkStrategy);
+                heapSizePart = sizeStr + labelStr;
                 printedHeapBytes += byteSize;
                 printedHeapItems++;
             }
@@ -720,6 +721,10 @@ private void printBreakdowns() {
                         .flushln();
     }
 
+    private static String getBreakdownSizeString(long sizeInBytes) {
+        return String.format("%9s ", ByteFormattingUtil.bytesToHuman(sizeInBytes));
+    }
+
     private void printRecommendations() {
         if (!SubstrateOptions.BuildOutputRecommendations.getValue()) {
             return;

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

@@ -25,6 +25,7 @@
 
 package com.oracle.svm.hosted;
 
+import java.net.URL;
 import java.security.CodeSource;
 
 final class ProgressReporterUtils {
@@ -53,15 +54,6 @@ static double toPercentage(long part, long total) {
         return part / (double) total * 100;
     }
 
-    private static String truncateName(String name, double maxLineRatio) {
-        int length = name.length();
-        int maxLength = maxLength(maxLineRatio);
-        if (length <= maxLength) {
-            return name;
-        }
-        return TRUNCATION_PLACEHOLDER + name.substring(length - maxLength + TRUNCATION_PLACEHOLDER.length(), length);
-    }
-
     static String truncateFQN(String fqn, double maxLineRatio) {
         return truncateFQN(fqn, maxLength(maxLineRatio));
     }
@@ -70,7 +62,7 @@ static int maxLength(double maxLineRatio) {
         return (int) Math.floor(ProgressReporter.CHARACTERS_PER_LINE * maxLineRatio);
     }
 
-    private static String truncateFQN(String fqn, int maxLength) {
+    static String truncateFQN(String fqn, int maxLength) {
         int classNameLength = fqn.length();
         if (classNameLength <= maxLength) {
             return fqn;
@@ -103,8 +95,11 @@ private static String truncateFQN(String fqn, int maxLength) {
     }
 
     static String moduleNamePrefix(Module javaModule) {
-        String moduleName = javaModule.isNamed() ? javaModule.getName() : "";
-        return truncateFQN(mapToNativeImageRuntime(moduleName), 0.10) + "/";
+        if (!javaModule.isNamed()) {
+            return "";
+        }
+        String moduleName = javaModule.getName();
+        return truncateFQN(mapToNativeImageRuntime(moduleName), 0.12) + "/";
     }
 
     private static String mapToNativeImageRuntime(String moduleName) {
@@ -122,21 +117,21 @@ static BreakDownClassifier of(Class<?> clazz) {
 
         private static String sourcePath(Class<?> clazz) {
             CodeSource codeSource = clazz.getProtectionDomain().getCodeSource();
-            if (codeSource != null && codeSource.getLocation() != null) {
-                String path = codeSource.getLocation().getPath();
-                // Use String API to determine basename of path to handle both / and \.
-                return path.substring(Math.max(path.lastIndexOf('/') + 1, path.lastIndexOf('\\') + 1));
+            if (codeSource != null) {
+                URL sourceLocation = codeSource.getLocation();
+                if (sourceLocation != null && !"jrt".equals(sourceLocation.getProtocol())) {
+                    return sourceLocation.getPath();
+                }
             }
             return null;
         }
 
         public String renderToString(int maxLength) {
-            String locationSuffix = location == null ? "" : " (" + truncateName(location, 0.10) + ")";
             String packageName = javaPackage == null ? "null" : javaPackage.getName();
             String moduleNamePrefix = moduleNamePrefix(javaModule);
             // Give remainder of space to package-part
-            int maxLengthPackage = maxLength - moduleNamePrefix.length() - locationSuffix.length();
-            return moduleNamePrefix + truncateFQN(packageName, maxLengthPackage) + locationSuffix;
+            int maxLengthPackage = maxLength - moduleNamePrefix.length();
+            return moduleNamePrefix + truncateFQN(packageName, maxLengthPackage);
         }
 
         public String[] elements() {