Merge pull request #1387 from benjchristensen/jmh-0.9

Upgrade to JMH 0.9

Author: benjchristensen

build.gradle

@@ -65,8 +65,8 @@ subprojects {
     }
 
     dependencies {
-        perfCompile 'org.openjdk.jmh:jmh-core:0.7.3'
-        perfCompile 'org.openjdk.jmh:jmh-generator-annprocess:0.7.3'
+        perfCompile 'org.openjdk.jmh:jmh-core:0.9'
+        perfCompile 'org.openjdk.jmh:jmh-generator-annprocess:0.9'
     }
 
     artifacts {

rxjava-core/src/perf/java/rx/PerfBaseline.java

@@ -4,7 +4,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -30,24 +30,24 @@ public int getSize() {
 
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void observableConsumption(Input input) throws InterruptedException {
         input.firehose.subscribe(input.observer);
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void observableViaRange(Input input) throws InterruptedException {
         input.observable.subscribe(input.observer);
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void iterableViaForLoopConsumption(Input input) throws InterruptedException {
         for (int i : input.iterable) {
             input.observer.onNext(i);
         }
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void iterableViaHasNextConsumption(Input input) throws InterruptedException {
         Iterator<Integer> iterator = input.iterable.iterator();
         while (iterator.hasNext()) {

rxjava-core/src/perf/java/rx/jmh/InputWithIncrementingInteger.java

@@ -18,7 +18,7 @@
 import java.util.Iterator;
 
 import org.openjdk.jmh.annotations.Setup;
-import org.openjdk.jmh.logic.BlackHole;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Observable;
 import rx.Observable.OnSubscribe;
@@ -32,13 +32,13 @@ public abstract class InputWithIncrementingInteger {
     public Iterable<Integer> iterable;
     public Observable<Integer> observable;
     public Observable<Integer> firehose;
-    private BlackHole bh;
+    private Blackhole bh;
     public Observer<Integer> observer;
 
     public abstract int getSize();
 
     @Setup
-    public void setup(final BlackHole bh) {
+    public void setup(final Blackhole bh) {
         this.bh = bh;
         observable = Observable.range(0, getSize());
 

rxjava-core/src/perf/java/rx/jmh/LatchedObserver.java

@@ -17,16 +17,16 @@
 
 import java.util.concurrent.CountDownLatch;
 
-import org.openjdk.jmh.logic.BlackHole;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Observer;
 
 public class LatchedObserver<T> implements Observer<T> {
 
     public CountDownLatch latch = new CountDownLatch(1);
-    private final BlackHole bh;
+    private final Blackhole bh;
 
-    public LatchedObserver(BlackHole bh) {
+    public LatchedObserver(Blackhole bh) {
         this.bh = bh;
     }
 

rxjava-core/src/perf/java/rx/operators/OperatorFlatMapPerf.java

@@ -18,7 +18,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -48,7 +48,7 @@ public int getSize() {
 
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void flatMapIntPassthruSync(Input input) throws InterruptedException {
         input.observable.flatMap(new Func1<Integer, Observable<Integer>>() {
 
@@ -60,7 +60,7 @@ public Observable<Integer> call(Integer i) {
         }).subscribe(input.observer);
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void flatMapIntPassthruAsync(Input input) throws InterruptedException {
         input.observable.flatMap(new Func1<Integer, Observable<Integer>>() {
 
@@ -72,7 +72,7 @@ public Observable<Integer> call(Integer i) {
         }).subscribe(input.observer);
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void flatMapTwoNestedSync(final Input input) throws InterruptedException {
         Observable.range(1, 2).flatMap(new Func1<Integer, Observable<Integer>>() {
 
@@ -85,7 +85,7 @@ public Observable<Integer> call(Integer i) {
     }
 
     // this runs out of memory currently
-    //    @GenerateMicroBenchmark
+    //    @Benchmark
     //    public void flatMapTwoNestedAsync(final Input input) throws InterruptedException {
     //        Observable.range(1, 2).flatMap(new Func1<Integer, Observable<Integer>>() {
     //

rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java

@@ -18,7 +18,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -47,12 +47,12 @@ public int getSize() {
 
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void mapPassThruViaLift(Input input) throws InterruptedException {
         input.observable.lift(MAP_OPERATOR).subscribe(input.observer);
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void mapPassThru(Input input) throws InterruptedException {
         input.observable.map(IDENTITY_FUNCTION).subscribe(input.observer);
     }

rxjava-core/src/perf/java/rx/operators/OperatorMergePerf.java

@@ -20,14 +20,14 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.logic.BlackHole;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Observable;
 import rx.functions.Func1;
@@ -52,7 +52,7 @@ public int getSize() {
 
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void mergeSynchronous(final Input input) throws InterruptedException {
         Observable<Observable<Integer>> os = input.observable.map(new Func1<Integer, Observable<Integer>>() {
 
@@ -67,7 +67,7 @@ public Observable<Integer> call(Integer i) {
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void mergeAsynchronous(final Input input) throws InterruptedException {
         Observable<Observable<Integer>> os = input.observable.map(new Func1<Integer, Observable<Integer>>() {
 
@@ -82,15 +82,15 @@ public Observable<Integer> call(Integer i) {
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void mergeTwoAsyncStreams(final Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         Observable<Integer> ob = Observable.range(0, input.size).subscribeOn(Schedulers.computation());
         Observable.merge(ob, ob).subscribe(o);
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void mergeNStreams(final InputForMergeN input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         Observable.merge(input.observables).subscribe(o);
@@ -102,11 +102,11 @@ public static class InputForMergeN {
         @Param({ "1", "100", "1000" })
         public int size;
 
-        private BlackHole bh;
+        private Blackhole bh;
         List<Observable<Integer>> observables;
 
         @Setup
-        public void setup(final BlackHole bh) {
+        public void setup(final Blackhole bh) {
             this.bh = bh;
             observables = new ArrayList<Observable<Integer>>();
             for (int i = 0; i < size; i++) {

rxjava-core/src/perf/java/rx/operators/OperatorObserveOnPerf.java

@@ -18,7 +18,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -46,21 +46,21 @@ public int getSize() {
 
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void observeOnComputation(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.observable.observeOn(Schedulers.computation()).subscribe(o);
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void observeOnNewThread(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.observable.observeOn(Schedulers.newThread()).subscribe(o);
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void observeOnImmediate(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.observable.observeOn(Schedulers.immediate()).subscribe(o);

rxjava-core/src/perf/java/rx/operators/OperatorSerializePerf.java

@@ -18,13 +18,13 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.logic.BlackHole;
+import org.openjdk.jmh.infra.Blackhole;
 
 import rx.Observable;
 import rx.Observable.OnSubscribe;
@@ -49,21 +49,21 @@ public int getSize() {
         }
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void noSerializationSingleThreaded(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.firehose.subscribe(o);
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void serializedSingleStream(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.firehose.serialize().subscribe(o);
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void serializedTwoStreamsHighlyContended(final Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         Observable.create(new OnSubscribe<Integer>() {
@@ -94,14 +94,14 @@ public int getSize() {
         }
 
         @Override
-        public void setup(BlackHole bh) {
+        public void setup(Blackhole bh) {
             super.setup(bh);
 
             interval = Observable.timer(0, 1, TimeUnit.MILLISECONDS).take(size).cast(Integer.class);
         }
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void serializedTwoStreamsSlightlyContended(final InputWithInterval input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         Observable.create(new OnSubscribe<Integer>() {
@@ -118,7 +118,7 @@ public void call(Subscriber<? super Integer> s) {
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void serializedTwoStreamsOneFastOneSlow(final InputWithInterval input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         Observable.create(new OnSubscribe<Integer>() {

rxjava-core/src/perf/java/rx/schedulers/ComputationSchedulerPerf.java

@@ -18,7 +18,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Param;
@@ -46,14 +46,14 @@ public int getSize() {
 
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void subscribeOn(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.observable.subscribeOn(Schedulers.computation()).subscribe(o);
         o.latch.await();
     }
 
-    @GenerateMicroBenchmark
+    @Benchmark
     public void observeOn(Input input) throws InterruptedException {
         LatchedObserver<Integer> o = input.newLatchedObserver();
         input.observable.observeOn(Schedulers.computation()).subscribe(o);