From 41880263e0455777fbd2828385ac26354a087789 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 21 Sep 2026 14:55:02 -0400 Subject: [PATCH 1/2] add option to reorder some benchmarks --- .../org/jlab/utils/benchmark/Benchmark.java | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java index fa4eafab8e..25e45b1cd8 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java @@ -1,8 +1,12 @@ package org.jlab.utils.benchmark; import java.util.Arrays; +import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Timer; import java.util.TimerTask; @@ -12,14 +16,19 @@ * * @author gavalian */ -public class Benchmark { - +public class Benchmark implements Comparator { + private static final Benchmark benchmarkInstance = new Benchmark(); - private final Map timerStore = new LinkedHashMap<>(); + private Map timerStore = new LinkedHashMap<>(); private Timer updateTimer = null; + private final ArrayList specials = new ArrayList<>(); public Benchmark() {} - + + public Benchmark(String[] specials) { + this.specials.addAll(Arrays.asList(specials)); + } + public static Benchmark getInstance(){ return benchmarkInstance; } @@ -111,4 +120,22 @@ public String[] toCSV() { }; } + public void sortHeaders() { + List keys = new ArrayList<>(timerStore.keySet()); + Collections.sort(keys, this); + Map timers = new LinkedHashMap<>(); + for (String s : keys) + timers.put(s, timerStore.get(s)); + timerStore = timers; + } + + @Override + public int compare(String s1, String s2) { + if (specials.contains(s1)) { + return specials.contains(s2) ? s1.compareTo(s2) : -1; + } else { + return specials.contains(s2) ? 1 : s1.compareTo(s2); + } + } + } From 66bda16d150020b46989d5f99aa5fd04b22dc025 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Mon, 21 Sep 2026 16:08:40 -0400 Subject: [PATCH 2/2] rename new method --- .../src/main/java/org/jlab/utils/benchmark/Benchmark.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java index e17085a201..5bb5b9ec1f 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/Benchmark.java @@ -120,7 +120,7 @@ public String[] toCSV() { }; } - public void sortHeaders() { + public void sortByName() { List keys = new ArrayList<>(timerStore.keySet()); Collections.sort(keys, this); Map timers = new LinkedHashMap<>();