From 45a731fee793f8b0ed4a99ce38362f0ec2314398 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Tue, 15 Sep 2026 15:36:27 -0400 Subject: [PATCH 1/2] fix thread safety --- .../main/java/org/jlab/utils/benchmark/BenchmarkTimer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java index 6fbb19be2c..bf248059b2 100644 --- a/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java +++ b/common-tools/clas-utils/src/main/java/org/jlab/utils/benchmark/BenchmarkTimer.java @@ -1,7 +1,7 @@ package org.jlab.utils.benchmark; import java.util.ArrayList; -import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -12,8 +12,8 @@ public class BenchmarkTimer { public static class BenchmarkMultiTimer extends BenchmarkTimer { - HashMap timeAtResume = new HashMap<>(); - HashMap isPaused = new HashMap<>(); + ConcurrentHashMap timeAtResume = new ConcurrentHashMap<>(); + ConcurrentHashMap isPaused = new ConcurrentHashMap<>(); public BenchmarkMultiTimer(String name) { super(name); } public void resume(int thread) { if (!isPaused.containsKey(thread) || isPaused.get(thread)) { From aa12432f286dd7eb70e7b9c3ea162e7d2d89356c Mon Sep 17 00:00:00 2001 From: Christopher Dilks Date: Fri, 18 Sep 2026 18:07:35 -0400 Subject: [PATCH 2/2] ci: trigger again, since something is wrong with rebase trigger