Fix and simplify ByteFormattingUtil.

It shows KB/MB/GB but calculated KiB/MiB/GiB.

Author: fniephaus

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

@@ -25,35 +25,23 @@
 package com.oracle.svm.hosted;
 
 public class ByteFormattingUtil {
-    private static final double BYTES_TO_KiB = 1024d;
-    private static final double BYTES_TO_MiB = 1024d * 1024d;
-    private static final double BYTES_TO_GiB = 1024d * 1024d * 1024d;
+    private static final double BYTES_TO_KB = 1000d;
+    private static final double BYTES_TO_MB = 1000d * 1000d;
+    private static final double BYTES_TO_GB = 1000d * 1000d * 1000d;
 
     public static String bytesToHuman(long bytes) {
-        return bytesToHuman("%4.2f", bytes);
-    }
-
-    public static String bytesToHuman(String format, long bytes) {
-        if (bytes < BYTES_TO_KiB) {
-            return String.format(format, (double) bytes) + "B";
-        } else if (bytes < BYTES_TO_MiB) {
-            return String.format(format, bytesToKiB(bytes)) + "kB";
-        } else if (bytes < BYTES_TO_GiB) {
-            return String.format(format, bytesToMiB(bytes)) + "MB";
+        if (bytes < BYTES_TO_KB) {
+            return toHuman(bytes, "B");
+        } else if (bytes < BYTES_TO_MB) {
+            return toHuman(bytes / BYTES_TO_KB, "KB");
+        } else if (bytes < BYTES_TO_GB) {
+            return toHuman(bytes / BYTES_TO_MB, "MB");
         } else {
-            return String.format(format, bytesToGiB(bytes)) + "GB";
+            return toHuman(bytes / BYTES_TO_GB, "GB");
         }
     }
 
-    static double bytesToKiB(long bytes) {
-        return bytes / BYTES_TO_KiB;
-    }
-
-    static double bytesToGiB(long bytes) {
-        return bytes / BYTES_TO_GiB;
-    }
-
-    static double bytesToMiB(long bytes) {
-        return bytes / BYTES_TO_MiB;
+    private static String toHuman(double value, String unit) {
+        return "%.2f%s".formatted(value, unit);
     }
 }

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

@@ -447,7 +447,7 @@ private void printResourceInfo() {
 
         l().printLineSeparator();
         l().yellowBold().doclink("Build resources", "#glossary-build-resources").a(":").reset().println();
-        l().a(" - %.2fGB of memory (%.1f%% of system memory, reason: %s)", ByteFormattingUtil.bytesToGiB(maxMemory), Utils.toPercentage(maxMemory, totalMemorySize), memoryUsageReason).println();
+        l().a(" - %s of memory (%.1f%% of system memory, reason: %s)", ByteFormattingUtil.bytesToHuman(maxMemory), Utils.toPercentage(maxMemory, totalMemorySize), memoryUsageReason).println();
         l().a(" - %s thread(s) (%.1f%% of %s available processor(s), %s)",
                         maxNumberOfThreads, Utils.toPercentage(maxNumberOfThreads, availableProcessors), availableProcessors, maxNumberOfThreadsSuffix).println();
     }
@@ -838,7 +838,7 @@ private void printResourceStatistics() {
                         .doclink("GCs", "#glossary-garbage-collections");
         long peakRSS = ProgressReporterCHelper.getPeakRSS();
         if (peakRSS >= 0) {
-            p.a(" | ").doclink("Peak RSS", "#glossary-peak-rss").a(": ").a("%.2fGB", ByteFormattingUtil.bytesToGiB(peakRSS));
+            p.a(" | ").doclink("Peak RSS", "#glossary-peak-rss").a(": ").a(ByteFormattingUtil.bytesToHuman(peakRSS));
         }
         recordJsonMetric(ResourceUsageKey.PEAK_RSS, (peakRSS >= 0 ? peakRSS : UNAVAILABLE_METRIC));
         long processCPUTime = getOperatingSystemMXBean().getProcessCpuTime();
@@ -863,7 +863,7 @@ private void checkForExcessiveGarbageCollection() {
                             .a(": %.1fs spent in %d GCs during the last stage, taking up %.2f%% of the time.",
                                             Utils.millisToSeconds(gcTimeDeltaMillis), currentGCStats.totalCount - lastGCStats.totalCount, ratio * 100)
                             .println();
-            l().a("            Please ensure more than %.2fGB of memory is available for Native Image", ByteFormattingUtil.bytesToGiB(ProgressReporterCHelper.getPeakRSS())).println();
+            l().a("            Please ensure more than %s of memory is available for Native Image", ByteFormattingUtil.bytesToHuman(ProgressReporterCHelper.getPeakRSS())).println();
             l().a("            to reduce GC overhead and improve image build time.").println();
         }
         lastGCStats = currentGCStats;
@@ -899,8 +899,8 @@ private static double nanosToSeconds(double nanos) {
             return nanos / NANOS_TO_SECONDS;
         }
 
-        private static double getUsedMemory() {
-            return ByteFormattingUtil.bytesToGiB(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
+        private static String getUsedMemory() {
+            return ByteFormattingUtil.bytesToHuman(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory());
         }
 
         private static String stringFilledWith(int size, String fill) {
@@ -1229,7 +1229,7 @@ void end(double totalTime) {
                 a("]").reset();
             }
 
-            String suffix = String.format("(%.1fs @ %.2fGB)", Utils.millisToSeconds(totalTime), Utils.getUsedMemory());
+            String suffix = String.format("(%.1fs @ %s)", Utils.millisToSeconds(totalTime), Utils.getUsedMemory());
             int textLength = getCurrentTextLength();
             // TODO: `assert textLength > 0;` should be used here but tests do not start stages
             // properly (GR-35721)