Make JMH options modifiable through the subclassed benchmark.

daschl · Norman Maurer · commit 3b77a71ffd02 · 2014-01-15T18:48:33.000+01:00
diff --git a/microbench/src/test/java/io/netty/microbench/buffer/ByteBufAllocatorBenchmark.java b/microbench/src/test/java/io/netty/microbench/buffer/ByteBufAllocatorBenchmark.java
@@ -21,13 +21,10 @@
 import io.netty.buffer.UnpooledByteBufAllocator;
 import io.netty.microbench.util.AbstractMicrobenchmark;
 import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
-import org.openjdk.jmh.annotations.Scope;
-import org.openjdk.jmh.annotations.State;
 
 /**
  * This class benchmarks different allocators with different allocation sizes.
  */
-@State(Scope.Thread)
 public class ByteBufAllocatorBenchmark extends AbstractMicrobenchmark {
 
     private final ByteBufAllocator unpooledHeapAllocator = new UnpooledByteBufAllocator(false);
diff --git a/microbench/src/test/java/io/netty/microbench/util/AbstractMicrobenchmark.java b/microbench/src/test/java/io/netty/microbench/util/AbstractMicrobenchmark.java
@@ -17,23 +17,30 @@
 
 import io.netty.util.ResourceLeakDetector;
 import org.junit.Test;
-import org.openjdk.jmh.output.OutputFormatType;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
 import org.openjdk.jmh.output.results.ResultFormatType;
 import org.openjdk.jmh.runner.Runner;
 import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
-import org.openjdk.jmh.runner.options.Options;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 
 import java.io.File;
 
 /**
  * Base class for all JMH benchmarks.
  */
+@Warmup(iterations = AbstractMicrobenchmark.DEFAULT_WARMUP_ITERATIONS)
+@Measurement(iterations = AbstractMicrobenchmark.DEFAULT_MEASURE_ITERATIONS)
+@Fork(AbstractMicrobenchmark.DEFAULT_FORKS)
+@State(Scope.Thread)
 public class AbstractMicrobenchmark {
 
-    protected static final String WARMUP_ITERATIONS = "10";
-    protected static final String MEASURE_ITERATIONS = "10";
-    protected static final String NUM_FORKS = "2";
+    protected static final int DEFAULT_WARMUP_ITERATIONS = 10;
+    protected static final int DEFAULT_MEASURE_ITERATIONS = 1;
+    protected static final int DEFAULT_FORKS = 2;
 
     protected static final String JVM_ARGS = "-server -dsa -da -ea:io.netty... -Xms768m" +
         " -Xmx768m -XX:MaxDirectMemorySize=768m -XX:+AggressiveOpts -XX:+UseBiasedLocking" +
@@ -50,10 +57,19 @@ public void run() throws Exception {
 
         ChainedOptionsBuilder runnerOptions = new OptionsBuilder()
             .include(".*" + className + ".*")
-            .jvmArgs(JVM_ARGS)
-            .warmupIterations(getWarmupIterations())
-            .measurementIterations(getMeasureIterations())
-            .forks(getForks());
+            .jvmArgs(JVM_ARGS);
+
+        if (getWarmupIterations() > 0) {
+            runnerOptions.warmupIterations(getWarmupIterations());
+        }
+
+        if (getMeasureIterations() > 0) {
+            runnerOptions.measurementIterations(getMeasureIterations());
+        }
+
+        if (getForks() > 0) {
+            runnerOptions.forks(getForks());
+        }
 
         if (getReportDir() != null) {
             String filePath = getReportDir() + className + ".json";
@@ -73,15 +89,15 @@ public void run() throws Exception {
     }
 
     protected int getWarmupIterations() {
-        return Integer.parseInt(System.getProperty("warmupIterations", WARMUP_ITERATIONS));
+        return Integer.parseInt(System.getProperty("warmupIterations", "-1"));
     }
 
     protected int getMeasureIterations() {
-        return Integer.parseInt(System.getProperty("measureIterations", MEASURE_ITERATIONS));
+        return Integer.parseInt(System.getProperty("measureIterations", "-1"));
     }
 
     protected int getForks() {
-        return Integer.parseInt(System.getProperty("forks", NUM_FORKS));
+        return Integer.parseInt(System.getProperty("forks", "-1"));
     }
 
     protected String getReportDir() {
