make MapStatsContainer thread-safe and fix tests

mtf90 · mtf90 · commit e9a1975a1475 · 2025-11-21T11:59:16.000+01:00
diff --git a/api/src/main/java/de/learnlib/sul/TimedSUL.java b/api/src/main/java/de/learnlib/sul/TimedSUL.java
@@ -1,9 +1,9 @@
 package de.learnlib.sul;
 
-import net.automatalib.symbol.time.TimedOutput;
-import net.automatalib.symbol.time.TimedInput;
 import net.automatalib.symbol.time.InputSymbol;
 import net.automatalib.symbol.time.TimeStepSequence;
+import net.automatalib.symbol.time.TimedInput;
+import net.automatalib.symbol.time.TimedOutput;
 import net.automatalib.symbol.time.TimeoutSymbol;
 import net.automatalib.word.Word;
 import net.automatalib.word.WordBuilder;
@@ -101,4 +101,8 @@ default Word<TimedOutput<O>> collectTimeouts(TimeStepSequence<I> input) {
         return wbOutput.toWord();
     }
 
+    @Override
+    default TimedSUL<I, O> fork() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/examples/src/main/java/de/learnlib/example/mmlt/Example1.java b/examples/src/main/java/de/learnlib/example/mmlt/Example1.java
@@ -126,7 +126,7 @@ private static void runExperiment(ExtensibleLStarMMLT<String, String> learner,
         stats.setCounter("result_locs", "Locations in result", finalHypothesis.getStates().size());
 
         // Print final result + statistics:
-        stats.printStats();
+        System.out.println(stats.printStats());
 
         new ObservationTableASCIIWriter<>().write(learner.getObservationTable(), System.out);
 
diff --git a/filters/cache/src/test/java/de/learnlib/filter/cache/AbstractParallelCacheTest.java b/filters/cache/src/test/java/de/learnlib/filter/cache/AbstractParallelCacheTest.java
@@ -22,6 +22,7 @@
 import de.learnlib.oracle.EquivalenceOracle;
 import de.learnlib.oracle.ParallelOracle;
 import de.learnlib.query.DefaultQuery;
+import de.learnlib.statistic.Statistics;
 import net.automatalib.alphabet.Alphabet;
 import net.automatalib.common.util.collection.IterableUtil;
 import net.automatalib.word.Word;
@@ -64,14 +65,15 @@ public void setUp() {
         this.targetModel = getTargetModel();
         this.cache = getCacheRepresentative();
         this.parallelOracle = getParallelOracle();
+        Statistics.getContainer().clear();
     }
 
     @AfterClass
     public void teardown() {
         this.parallelOracle.shutdownNow();
     }
 
-    @Test(timeOut = 20000)
+    @Test
     public void testConcurrentMembershipQueries() {
         Assert.assertEquals(getNumberOfQueries(), 0);
 
@@ -103,7 +105,7 @@ public void testConcurrentMembershipQueries() {
         Assert.assertEquals(numOfQueriesAfter, numOfQueriesBefore);
     }
 
-    @Test(dependsOnMethods = "testConcurrentMembershipQueries", timeOut = 20000)
+    @Test(dependsOnMethods = "testConcurrentMembershipQueries")
     public void testConcurrentEquivalenceQueries() {
         final long previousCount = getNumberOfQueries();
         final EquivalenceOracle<? super A, I, D> eqOracle = cache.createCacheConsistencyTest();
diff --git a/filters/cache/src/test/java/de/learnlib/filter/cache/dfa/AbstractDFACacheTest.java b/filters/cache/src/test/java/de/learnlib/filter/cache/dfa/AbstractDFACacheTest.java
@@ -58,7 +58,7 @@ protected DFACacheOracle<Character> getResumedOracle(DFACacheOracle<Character> o
 
     @Override
     protected long getNumberOfPosedQueries() {
-        return Statistics.getContainer().getCount(DFACounterOracle.SYMBOL_KEY).orElse(0L);
+        return Statistics.getContainer().getCount(DFACounterOracle.QUERY_KEY).orElse(0L);
     }
 
     @Override
diff --git a/filters/cache/src/test/java/de/learnlib/filter/cache/dfa/DFAHashCacheTest.java b/filters/cache/src/test/java/de/learnlib/filter/cache/dfa/DFAHashCacheTest.java
@@ -56,7 +56,7 @@ protected DFAHashCacheOracle<Character> getResumedOracle(DFAHashCacheOracle<Char
 
     @Override
     protected long getNumberOfPosedQueries() {
-        return Statistics.getContainer().getCount(DFACounterOracle.SYMBOL_KEY).orElse(0L);
+        return Statistics.getContainer().getCount(DFACounterOracle.QUERY_KEY).orElse(0L);
     }
 
     @Override
diff --git a/filters/cache/src/test/java/de/learnlib/filter/cache/dfa/DFAParallelCacheTest.java b/filters/cache/src/test/java/de/learnlib/filter/cache/dfa/DFAParallelCacheTest.java
@@ -75,6 +75,6 @@ protected ParallelOracle<Character, Boolean> getParallelOracle() {
 
     @Override
     protected long getNumberOfQueries() {
-        return Statistics.getContainer().getCount(DFACounterOracle.SYMBOL_KEY).orElse(0L);
+        return Statistics.getContainer().getCount(DFACounterOracle.QUERY_KEY).orElse(0L);
     }
 }
diff --git a/filters/statistics/pom.xml b/filters/statistics/pom.xml
@@ -52,6 +52,10 @@ limitations under the License.
             <groupId>de.learnlib.tooling</groupId>
             <artifactId>annotations</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.kohsuke.metainf-services</groupId>
+            <artifactId>metainf-services</artifactId>
+        </dependency>
 
         <!-- test -->
         <dependency>
diff --git a/filters/statistics/src/main/java/de/learnlib/filter/statistic/container/MapStatsContainer.java b/filters/statistics/src/main/java/de/learnlib/filter/statistic/container/MapStatsContainer.java
@@ -14,12 +14,12 @@ public class MapStatsContainer implements StatsContainer {
     private final Map<String, LearnerStatistic> statistics = new HashMap<>(); // id -> stat
 
     @Override
-    public void addTextInfo(String id, @Nullable String description, String text) {
+    public synchronized void addTextInfo(String id, @Nullable String description, String text) {
         statistics.put(id, new TextStatistic(id, description, text));
     }
 
     @Override
-    public Optional<String> getTextValue(String id) {
+    public synchronized Optional<String> getTextValue(String id) {
         var value = statistics.get(id);
         if (value instanceof TextStatistic textStatistic) {
             return Optional.of(textStatistic.getText());
@@ -28,12 +28,12 @@ public Optional<String> getTextValue(String id) {
     }
 
     @Override
-    public void setFlag(String id, @Nullable String description, boolean value) {
+    public synchronized void setFlag(String id, @Nullable String description, boolean value) {
         statistics.put(id, new FlagStatistic(id, description, value));
     }
 
     @Override
-    public Optional<Boolean> getFlagValue(String id) {
+    public synchronized Optional<Boolean> getFlagValue(String id) {
         var value = statistics.get(id);
         if (value instanceof FlagStatistic flagStatistic) {
             return Optional.of(flagStatistic.isFlagged());
@@ -42,7 +42,7 @@ public Optional<Boolean> getFlagValue(String id) {
     }
 
     @Override
-    public void startOrResumeClock(String id, @Nullable String description) {
+    public synchronized void startOrResumeClock(String id, @Nullable String description) {
         var value = statistics.get(id);
         if (value instanceof StopClockStatistic clockStatistic) {
             clockStatistic.resume();
@@ -55,15 +55,15 @@ public void startOrResumeClock(String id, @Nullable String description) {
     }
 
     @Override
-    public void pauseClock(String id) {
+    public synchronized void pauseClock(String id) {
         var value = statistics.get(id);
         if (value instanceof StopClockStatistic clockStatistic) {
             clockStatistic.pause();
         }
     }
 
     @Override
-    public Optional<Duration> getClockValue(String id) {
+    public synchronized Optional<Duration> getClockValue(String id) {
         var value = statistics.get(id);
         if (value instanceof StopClockStatistic clockStatistic) {
             return Optional.of(clockStatistic.getElapsed());
@@ -72,7 +72,7 @@ public Optional<Duration> getClockValue(String id) {
     }
 
     @Override
-    public void increaseCounter(String id, @Nullable String description, long increment) {
+    public synchronized void increaseCounter(String id, @Nullable String description, long increment) {
         var value = statistics.get(id);
         if (value instanceof CounterStatistic counterStatistic) {
             counterStatistic.increase(increment);
@@ -83,12 +83,12 @@ public void increaseCounter(String id, @Nullable String description, long increm
     }
 
     @Override
-    public void setCounter(String id, @Nullable String description, long count) {
+    public synchronized void setCounter(String id, @Nullable String description, long count) {
         statistics.put(id, new CounterStatistic(id, description, count));
     }
 
     @Override
-    public Optional<Long> getCount(String id) {
+    public synchronized Optional<Long> getCount(String id) {
         var value = statistics.get(id);
         if (value instanceof CounterStatistic counterStatistic) {
             return Optional.of(counterStatistic.getCount());
@@ -97,7 +97,7 @@ public Optional<Long> getCount(String id) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         statistics.clear();
     }
 
diff --git a/filters/statistics/src/main/java/de/learnlib/filter/statistic/container/MapStatsProvider.java b/filters/statistics/src/main/java/de/learnlib/filter/statistic/container/MapStatsProvider.java
@@ -2,7 +2,9 @@
 
 import de.learnlib.statistic.StatisticsProvider;
 import de.learnlib.statistic.StatsContainer;
+import org.kohsuke.MetaInfServices;
 
+@MetaInfServices(StatisticsProvider.class)
 public class MapStatsProvider implements StatisticsProvider {
 
     final ThreadLocal<StatsContainer> threadLocal = ThreadLocal.withInitial(MapStatsContainer::new);
diff --git a/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterObservableSUL.java b/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterObservableSUL.java
@@ -15,6 +15,8 @@
  */
 package de.learnlib.filter.statistic.sul;
 
+import de.learnlib.statistic.Statistics;
+import de.learnlib.statistic.StatsContainer;
 import de.learnlib.sul.ObservableSUL;
 
 public class CounterObservableSUL<S, I, O> extends CounterSUL<I, O> implements ObservableSUL<S, I, O> {
@@ -25,14 +27,18 @@ public CounterObservableSUL(ObservableSUL<S, I, O> sul) {
         this(sul, "");
     }
 
-    private CounterObservableSUL(ObservableSUL<S, I, O> sul, String prefix) {
-        super(sul, prefix);
+    public CounterObservableSUL(ObservableSUL<S, I, O> sul, String prefix) {
+        this(sul, prefix, Statistics.getContainer());
+    }
+
+    protected CounterObservableSUL(ObservableSUL<S, I, O> sul, String prefix, StatsContainer statistics) {
+        super(sul, prefix, statistics);
         this.sul = sul;
     }
 
     @Override
     public ObservableSUL<S, I, O> fork() {
-        return new CounterObservableSUL<>(this.sul.fork(), super.prefix);
+        return new CounterObservableSUL<>(this.sul.fork(), super.prefix, super.statistics);
     }
 
     @Override
diff --git a/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterSUL.java b/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterSUL.java
@@ -33,9 +33,13 @@ public CounterSUL(SUL<I, O> sul) {
     }
 
     public CounterSUL(SUL<I, O> sul, String prefix) {
+        this(sul, prefix, Statistics.getContainer());
+    }
+
+    protected CounterSUL(SUL<I, O> sul, String prefix, StatsContainer statistics) {
         this.sul = sul;
         this.prefix = prefix;
-        this.statistics = Statistics.getContainer();
+        this.statistics = statistics;
     }
 
     @Override
@@ -62,6 +66,6 @@ public boolean canFork() {
 
     @Override
     public SUL<I, O> fork() {
-        return new CounterSUL<>(this.sul.fork(), this.prefix);
+        return new CounterSUL<>(this.sul.fork(), this.prefix, this.statistics);
     }
 }
diff --git a/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterStateLocalInputSUL.java b/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterStateLocalInputSUL.java
@@ -17,6 +17,8 @@
 
 import java.util.Collection;
 
+import de.learnlib.statistic.Statistics;
+import de.learnlib.statistic.StatsContainer;
 import de.learnlib.sul.StateLocalInputSUL;
 
 public class CounterStateLocalInputSUL<I, O> extends CounterSUL<I, O> implements StateLocalInputSUL<I, O> {
@@ -30,7 +32,11 @@ public CounterStateLocalInputSUL(StateLocalInputSUL<I, O> sul) {
     }
 
     private CounterStateLocalInputSUL(StateLocalInputSUL<I, O> sul, String prefix) {
-        super(sul, prefix);
+        this(sul, prefix, Statistics.getContainer());
+    }
+
+    protected CounterStateLocalInputSUL(StateLocalInputSUL<I, O> sul, String prefix, StatsContainer statistics) {
+        super(sul, prefix, statistics);
         this.sul = sul;
     }
 
@@ -42,7 +48,7 @@ public Collection<I> currentlyEnabledInputs() {
 
     @Override
     public StateLocalInputSUL<I, O> fork() {
-        return new CounterStateLocalInputSUL<>(this.sul.fork(), super.prefix);
+        return new CounterStateLocalInputSUL<>(this.sul.fork(), super.prefix, super.statistics);
     }
 
 }
diff --git a/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterTimedSUL.java b/filters/statistics/src/main/java/de/learnlib/filter/statistic/sul/CounterTimedSUL.java
@@ -28,9 +28,13 @@ public CounterTimedSUL(TimedSUL<I, O> delegate) {
     }
 
     public CounterTimedSUL(TimedSUL<I, O> delegate, String name) {
+        this(delegate, name, Statistics.getContainer());
+    }
+
+    protected CounterTimedSUL(TimedSUL<I, O> delegate, String name, StatsContainer statistics) {
         this.delegate = delegate;
         this.name = name;
-        this.stats = Statistics.getContainer();
+        this.stats = statistics;
     }
 
     private String withPrefix(String label) {
@@ -82,5 +86,15 @@ public void post() {
         this.delegate.post();
     }
 
+    @Override
+    public boolean canFork() {
+        return this.delegate.canFork();
+    }
+
+    @Override
+    public TimedSUL<I, O> fork() {
+        return new CounterTimedSUL<>(this.delegate.fork(), this.name, this.stats);
+    }
+
 
 }
diff --git a/filters/statistics/src/main/java/module-info.java b/filters/statistics/src/main/java/module-info.java
@@ -38,6 +38,7 @@
     // annotations are 'provided'-scoped and do not need to be loaded at runtime
     requires static de.learnlib.tooling.annotation;
     requires static org.checkerframework.checker.qual;
+    requires static org.kohsuke.metainf_services;
 
     exports de.learnlib.filter.statistic.learner;
     exports de.learnlib.filter.statistic.oracle;

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ protected DFACacheOracle<Character> getResumedOracle(DFACacheOracle<Character> o`
`58`	`58`
`59`	`59`	`@Override`
`60`	`60`	`protected long getNumberOfPosedQueries() {`
`61`		`- return Statistics.getContainer().getCount(DFACounterOracle.SYMBOL_KEY).orElse(0L);`
	`61`	`+ return Statistics.getContainer().getCount(DFACounterOracle.QUERY_KEY).orElse(0L);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ protected DFAHashCacheOracle<Character> getResumedOracle(DFAHashCacheOracle<Char`
`56`	`56`
`57`	`57`	`@Override`
`58`	`58`	`protected long getNumberOfPosedQueries() {`
`59`		`- return Statistics.getContainer().getCount(DFACounterOracle.SYMBOL_KEY).orElse(0L);`
	`59`	`+ return Statistics.getContainer().getCount(DFACounterOracle.QUERY_KEY).orElse(0L);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,6 @@ protected ParallelOracle<Character, Boolean> getParallelOracle() {`
`75`	`75`
`76`	`76`	`@Override`
`77`	`77`	`protected long getNumberOfQueries() {`
`78`		`- return Statistics.getContainer().getCount(DFACounterOracle.SYMBOL_KEY).orElse(0L);`
	`78`	`+ return Statistics.getContainer().getCount(DFACounterOracle.QUERY_KEY).orElse(0L);`
`79`	`79`	`}`
`80`	`80`	`}`