Move CounterPerf to test/benchmark folder

* Move the perf tests to outside of the main source code. * Update the counter-perf script to utilize the test-run.
jgroups-extras · Jun 9, 2024 · d531a60 · d531a60
1 parent 8741b8b
commit d531a60
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/bin/counter-perf.sh b/bin/counter-perf.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+BASEDIR=$(dirname "$0")
 
-`dirname $0`/run.sh -ea org.jgroups.perf.CounterPerf -props raft.xml  $*
+# shellcheck disable=SC2086,SC2048
+"$BASEDIR"/test-run.sh -ea org.jgroups.perf.counter.CounterPerf -props raft.xml $*
 
diff --git a/...g/jgroups/perf/AsyncCounterBenchmark.java → ...s/perf/counter/AsyncCounterBenchmark.java b/...g/jgroups/perf/AsyncCounterBenchmark.java → ...s/perf/counter/AsyncCounterBenchmark.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.counter;
 
 import org.HdrHistogram.AbstractHistogram;
 import org.HdrHistogram.AtomicHistogram;

diff --git a/src/org/jgroups/perf/CounterBenchmark.java → ...groups/perf/counter/CounterBenchmark.java b/src/org/jgroups/perf/CounterBenchmark.java → ...groups/perf/counter/CounterBenchmark.java
@@ -1,8 +1,8 @@
-package org.jgroups.perf;
+package org.jgroups.perf.counter;
 
 import org.HdrHistogram.AbstractHistogram;
 import org.HdrHistogram.Histogram;
-import org.jgroups.blocks.atomic.BaseCounter;
+
 import org.jgroups.raft.blocks.RaftAsyncCounter;
 import org.jgroups.raft.blocks.RaftCounter;
 import org.jgroups.raft.blocks.RaftSyncCounter;

diff --git a/src/org/jgroups/perf/CounterPerf.java → ...org/jgroups/perf/counter/CounterPerf.java b/src/org/jgroups/perf/CounterPerf.java → ...org/jgroups/perf/counter/CounterPerf.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.counter;
 
 import org.HdrHistogram.AbstractHistogram;
 import org.HdrHistogram.Histogram;

diff --git a/src/org/jgroups/perf/HistogramUtil.java → ...g/jgroups/perf/counter/HistogramUtil.java b/src/org/jgroups/perf/HistogramUtil.java → ...g/jgroups/perf/counter/HistogramUtil.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.counter;
 
 import org.HdrHistogram.AbstractHistogram;
 import org.HdrHistogram.AtomicHistogram;

diff --git a/src/org/jgroups/perf/SyncBenchmark.java → ...g/jgroups/perf/counter/SyncBenchmark.java b/src/org/jgroups/perf/SyncBenchmark.java → ...g/jgroups/perf/counter/SyncBenchmark.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.counter;
 
 import org.HdrHistogram.AbstractHistogram;
 import org.HdrHistogram.Histogram;

diff --git a/...groups/perf/DataReplicationBenchmark.java → ...ps/perf/jmh/DataReplicationBenchmark.java b/...groups/perf/DataReplicationBenchmark.java → ...ps/perf/jmh/DataReplicationBenchmark.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.jmh;
 
 import org.jgroups.JChannel;
 import org.jgroups.protocols.raft.FileBasedLog;

diff --git a/...ark/org/jgroups/perf/LogJmhBenchmark.java → ...org/jgroups/perf/jmh/LogJmhBenchmark.java b/...ark/org/jgroups/perf/LogJmhBenchmark.java → ...org/jgroups/perf/jmh/LogJmhBenchmark.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.jmh;
 
 import org.jgroups.protocols.raft.*;
 import org.openjdk.jmh.annotations.*;

diff --git a/...groups/perf/StorageAppenderBenchmark.java → ...ps/perf/jmh/StorageAppenderBenchmark.java b/...groups/perf/StorageAppenderBenchmark.java → ...ps/perf/jmh/StorageAppenderBenchmark.java
@@ -1,4 +1,4 @@
-package org.jgroups.perf;
+package org.jgroups.perf.jmh;
 
 import com.sun.nio.file.ExtendedOpenOption;
 import org.openjdk.jmh.annotations.*;