CodeTimer now supports configurable reporting units

Author: kwvanderlinde

common/src/main/java/net/rptools/lib/StringUtil.java

@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 
 /**
@@ -28,6 +29,18 @@ public class StringUtil {
   private static NumberFormat nf = NumberFormat.getNumberInstance();
   private static final int MIN_FRACTION_DIGITS = 0;
 
+  public static String formatTimeUnit(TimeUnit unit) {
+    return switch (unit) {
+      case NANOSECONDS -> "ns";
+      case MICROSECONDS -> "μs";
+      case MILLISECONDS -> "ms";
+      case SECONDS -> "s";
+      case MINUTES -> "m";
+      case HOURS -> "h";
+      case DAYS -> "d";
+    };
+  }
+
   public static String formatDecimal(double value) {
     String result1;
     result1 = nf.format(value); // On a separate line to allow for breakpoints

src/main/java/net/rptools/lib/CodeTimer.java

@@ -18,6 +18,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import net.rptools.maptool.client.AppState;
 import net.rptools.maptool.client.MapTool;
 
@@ -66,6 +67,7 @@ public static CodeTimer get() {
   private final Map<String, Timer> timeMap = new LinkedHashMap<>();
   private final String name;
   private long threshold = 1;
+  private TimeUnit reportingUnit = TimeUnit.MILLISECONDS;
   private boolean enabled;
 
   private CodeTimer(String n) {
@@ -78,7 +80,15 @@ public boolean isEnabled() {
   }
 
   public void setThreshold(long threshold) {
-    this.threshold = threshold;
+    this.threshold = TimeUnit.NANOSECONDS.convert(threshold, TimeUnit.MILLISECONDS);
+  }
+
+  public void setThreshold(long threshold, TimeUnit timeUnit) {
+    this.threshold = TimeUnit.NANOSECONDS.convert(threshold, timeUnit);
+  }
+
+  public void setReportingUnit(TimeUnit reportingUnit) {
+    this.reportingUnit = reportingUnit;
   }
 
   public void setEnabled(boolean enabled) {
@@ -144,11 +154,18 @@ public String toString() {
       ++i;
 
       var id = entry.getKey();
-      long elapsed = entry.getValue().getElapsed() / 1_000_000;
+      long elapsed = entry.getValue().getElapsed();
       if (elapsed < threshold) {
         continue;
       }
-      builder.append(String.format("  %3d.  %6d ms  %s\n", i, elapsed, id));
+
+      builder.append(
+          String.format(
+              "  %3d.  %6d %s  %s\n",
+              i,
+              reportingUnit.convert(elapsed, TimeUnit.NANOSECONDS),
+              StringUtil.formatTimeUnit(reportingUnit),
+              id));
     }
 
     if (!counterMap.isEmpty()) {