Avoid usage of TruffleLogger in espresso.classfile

Author: gilles-duboscq

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/DebugTimer.java

@@ -27,9 +27,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import com.oracle.truffle.api.TruffleLogger;
 import com.oracle.truffle.espresso.classfile.descriptors.ErrorUtil;
 
 public final class DebugTimer {
@@ -90,7 +90,7 @@ public boolean equals(Object obj) {
     abstract static class DebugTimerImpl {
         abstract void tick(long tick);
 
-        abstract void report(TruffleLogger logger, String name);
+        abstract void report(Consumer<String> logger, String name);
 
         abstract void enter();
     }
@@ -114,11 +114,11 @@ void tick(long tick) {
         }
 
         @Override
-        void report(TruffleLogger logger, String name) {
+        void report(Consumer<String> logger, String name) {
             if (counter.get() == 0) {
-                logger.info(name + ": " + 0);
+                logger.accept(name + ": " + 0);
             } else {
-                logger.info(name + " total : " + getAsMillis(total()) + " | avg : " + getAsMillis(avg()));
+                logger.accept(name + " total : " + getAsMillis(total()) + " | avg : " + getAsMillis(avg()));
             }
         }
 

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/TimerCollection.java

@@ -24,7 +24,7 @@
  */
 package com.oracle.truffle.espresso.classfile.perf;
 
-import com.oracle.truffle.api.TruffleLogger;
+import java.util.function.Consumer;
 
 public abstract class TimerCollection {
     private static final TimerCollection NO_TIMER = new TimerCollectionImpl.NoTimer();
@@ -37,7 +37,7 @@ public static TimerCollection create(boolean enabled) {
         }
     }
 
-    public abstract void report(TruffleLogger logger);
+    public abstract void report(Consumer<String> logger);
 
     abstract DebugCloseable scope(DebugTimer timer);
 }

espresso-shared/src/com.oracle.truffle.espresso.classfile/src/com/oracle/truffle/espresso/classfile/perf/TimerCollectionImpl.java

@@ -28,8 +28,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-
-import com.oracle.truffle.api.TruffleLogger;
+import java.util.function.Consumer;
 
 class TimerCollectionImpl extends TimerCollection {
     private Map<DebugTimer, DebugTimer.DebugTimerImpl> mapping = new ConcurrentHashMap<>();
@@ -49,12 +48,12 @@ DebugCloseable scope(DebugTimer timer) {
     }
 
     @Override
-    public void report(TruffleLogger logger) {
+    public void report(Consumer<String> logger) {
         Set<DebugTimer> visited = new HashSet<>();
         report(mapping.keySet(), logger, visited, "");
     }
 
-    private void report(Iterable<DebugTimer> timers, TruffleLogger logger, Set<DebugTimer> visited, String prefix) {
+    private void report(Iterable<DebugTimer> timers, Consumer<String> logger, Set<DebugTimer> visited, String prefix) {
         for (DebugTimer timer : timers) {
             if (shouldProcess(visited, timer)) {
                 visited.add(timer);
@@ -86,7 +85,7 @@ DebugCloseable scope(DebugTimer timer) {
         }
 
         @Override
-        public void report(TruffleLogger logger) {
+        public void report(Consumer<String> logger) {
         }
     }
 }

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/runtime/EspressoShutdownHandler.java

@@ -277,7 +277,7 @@ private void teardown() {
             }
         }
 
-        getContext().getTimers().report(getContext().getLogger());
+        getContext().getTimers().report(getContext().getLogger()::info);
     }
 
     /**