Fix issue that counters are printed to wrong log.

Author: christianhaeubl

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateDiagnostics.java

@@ -740,7 +740,7 @@ public int maxInvocationCount() {
         @RestrictHeapAccess(access = RestrictHeapAccess.Access.NO_ALLOCATION, reason = "Must not allocate while printing diagnostics.")
         public void printDiagnostics(Log log, ErrorContext context, int maxDiagnosticLevel, int invocationCount) {
             log.string("Counters:").indent(true);
-            Counter.logValues();
+            Counter.logValues(log);
             log.indent(false);
         }
     }

substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/util/Counter.java

@@ -50,7 +50,7 @@
  * option is enabled. Counters are {@link Group grouped} for printing.
  *
  * Currently there is no shutdown hook in Substrate VM that is invoked automatically, so
- * {@link Counter#logValues()} needs to be called manually at the end of the application to print
+ * {@link Counter#logValues} needs to be called manually at the end of the application to print
  * counter values.
  *
  * Use this class in the following way:
@@ -112,27 +112,27 @@ public void reset() {
         /**
          * Prints all counters of this group to the {@link Log}.
          */
-        public void logValues() {
+        public void logValues(Log log) {
             long total = 0;
             int maxNameLen = 0;
             for (Counter counter : counters) {
                 total += counter.getValue();
                 maxNameLen = Math.max(counter.name.length(), maxNameLen);
             }
 
-            Log.log().string("=== ").string(name).string(" ===").newline();
+            log.string("=== ").string(name).string(" ===").newline();
             for (Counter counter : counters) {
                 long counterValue = counter.getValue();
                 long percent = total == 0 ? 0 : counterValue * 100 / total;
-                Log.log().string("  ").string(counter.name, maxNameLen, Log.RIGHT_ALIGN).string(":");
-                Log.log().unsigned(counterValue, 10, Log.RIGHT_ALIGN).unsigned(percent, 5, Log.RIGHT_ALIGN).string("%");
+                log.string("  ").string(counter.name, maxNameLen, Log.RIGHT_ALIGN).string(":");
+                log.unsigned(counterValue, 10, Log.RIGHT_ALIGN).unsigned(percent, 5, Log.RIGHT_ALIGN).string("%");
                 if (!counter.description.isEmpty()) {
-                    Log.log().string("  // ").string(counter.description);
+                    log.string("  // ").string(counter.description);
                 }
-                Log.log().newline();
+                log.newline();
             }
-            Log.log().string("  ").string("TOTAL", maxNameLen, Log.RIGHT_ALIGN).string(":");
-            Log.log().unsigned(total, 10, Log.RIGHT_ALIGN).newline();
+            log.string("  ").string("TOTAL", maxNameLen, Log.RIGHT_ALIGN).string(":");
+            log.unsigned(total, 10, Log.RIGHT_ALIGN).newline();
         }
     }
 
@@ -212,9 +212,9 @@ public void reset() {
     /**
      * Prints all counters of all enabled groups to the {@link Log}.
      */
-    public static void logValues() {
+    public static void logValues(Log log) {
         for (Counter.Group group : ImageSingletons.lookup(CounterSupport.class).enabledGroups) {
-            group.logValues();
+            group.logValues(log);
         }
     }
 }