Migrate Pre-JMH Tests to rx.archive

benjchristensen · benjchristensen · commit 3520445b61b7 · 2014-03-26T16:42:22.000-07:00
diff --git a/rxjava-core/src/perf/java/rx/archive/ObservableCreatePerformance.java b/rxjava-core/src/perf/java/rx/archive/ObservableCreatePerformance.java
@@ -1,9 +1,11 @@
-package rx;
+package rx.archive;
 
+import rx.Observable;
 import rx.Observable.OnSubscribe;
+import rx.Subscriber;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.LongSumObserver;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.LongSumObserver;
 
 public class ObservableCreatePerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/composition/RangeMapTakeOnNextPerf.java b/rxjava-core/src/perf/java/rx/archive/composition/RangeMapTakeOnNextPerf.java
@@ -1,8 +1,8 @@
-package rx.composition;
+package rx.archive.composition;
 
 import rx.Observable;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.util.functions.Action0;
 import rx.util.functions.Func1;
 
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorFromIterablePerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorFromIterablePerformance.java
@@ -1,13 +1,13 @@
-package rx.operators;
+package rx.archive.operators;
 
 import java.util.Arrays;
 import java.util.Iterator;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
+import rx.archive.perf.LongSumObserver;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
-import rx.perf.LongSumObserver;
 
 public class OperatorFromIterablePerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorMapPerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorMapPerformance.java
@@ -1,10 +1,10 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.LongSumObserver;
 import rx.functions.Action0;
 import rx.functions.Func1;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.LongSumObserver;
 
 public class OperatorMapPerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorMergePerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorMergePerformance.java
@@ -1,10 +1,10 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
+import rx.archive.perf.LongSumObserver;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
-import rx.perf.LongSumObserver;
 import rx.schedulers.Schedulers;
 
 public class OperatorMergePerformance extends AbstractPerformanceTester {
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorObserveOnPerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorObserveOnPerformance.java
@@ -1,9 +1,10 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
+import rx.operators.OperatorObserveOnBounded;
 import rx.schedulers.Schedulers;
 
 public class OperatorObserveOnPerformance extends AbstractPerformanceTester {
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorParallelPerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorParallelPerformance.java
@@ -1,10 +1,10 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
 import rx.functions.Func1;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
 
 public class OperatorParallelPerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorRangePerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorRangePerformance.java
@@ -1,9 +1,9 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
 
 public class OperatorRangePerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorSerializePerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorSerializePerformance.java
@@ -1,16 +1,16 @@
-package rx.operators;
+package rx.archive.operators;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
 import rx.functions.Action1;
 import rx.functions.Func1;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
 import rx.schedulers.Schedulers;
 
 public class OperatorSerializePerformance extends AbstractPerformanceTester {
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorSynchronizePerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorSynchronizePerformance.java
@@ -1,16 +1,16 @@
-package rx.operators;
+package rx.archive.operators;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
 import rx.functions.Action1;
 import rx.functions.Func1;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
 import rx.schedulers.Schedulers;
 
 public class OperatorSynchronizePerformance extends AbstractPerformanceTester {
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorTakePerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorTakePerformance.java
@@ -1,9 +1,9 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
 
 public class OperatorTakePerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/operators/OperatorZipPerformance.java b/rxjava-core/src/perf/java/rx/archive/operators/OperatorZipPerformance.java
@@ -1,10 +1,10 @@
-package rx.operators;
+package rx.archive.operators;
 
 import rx.Observable;
+import rx.archive.perf.AbstractPerformanceTester;
+import rx.archive.perf.IntegerSumObserver;
 import rx.functions.Action0;
 import rx.functions.Func2;
-import rx.perf.AbstractPerformanceTester;
-import rx.perf.IntegerSumObserver;
 
 public class OperatorZipPerformance extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/perf/AbstractPerformanceTester.java b/rxjava-core/src/perf/java/rx/archive/perf/AbstractPerformanceTester.java
@@ -1,4 +1,4 @@
-package rx.perf;
+package rx.archive.perf;
 
 import java.util.Iterator;
 
diff --git a/rxjava-core/src/perf/java/rx/archive/perf/IntegerSumObserver.java b/rxjava-core/src/perf/java/rx/archive/perf/IntegerSumObserver.java
@@ -1,4 +1,4 @@
-package rx.perf;
+package rx.archive.perf;
 
 import rx.Subscriber;
 
diff --git a/rxjava-core/src/perf/java/rx/archive/perf/LongSumObserver.java b/rxjava-core/src/perf/java/rx/archive/perf/LongSumObserver.java
@@ -1,4 +1,4 @@
-package rx.perf;
+package rx.archive.perf;
 
 import rx.Subscriber;
 
diff --git a/rxjava-core/src/perf/java/rx/archive/performance/PerformanceTest.java b/rxjava-core/src/perf/java/rx/archive/performance/PerformanceTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.performance;
+package rx.archive.performance;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/rxjava-core/src/perf/java/rx/archive/performance/TestChainPerformance.java b/rxjava-core/src/perf/java/rx/archive/performance/TestChainPerformance.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.performance;
+package rx.archive.performance;
 
 import java.util.ArrayList;
 import java.util.concurrent.Callable;
diff --git a/rxjava-core/src/perf/java/rx/archive/schedulers/SchedulerPerformanceTests.java b/rxjava-core/src/perf/java/rx/archive/schedulers/SchedulerPerformanceTests.java
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.schedulers;
+package rx.archive.schedulers;
 
 import java.util.Arrays;
 
 import rx.Observable;
 import rx.Scheduler;
 import rx.Subscriber;
 import rx.functions.Action0;
+import rx.schedulers.Schedulers;
 
 public class SchedulerPerformanceTests {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/schedulers/TestRecursionMemoryUsage.java b/rxjava-core/src/perf/java/rx/archive/schedulers/TestRecursionMemoryUsage.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright 2014 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package rx.archive.schedulers;
+
+import rx.Observable;
+import rx.Observable.OnSubscribe;
+import rx.Scheduler;
+import rx.Scheduler.Inner;
+import rx.Subscriber;
+import rx.functions.Action1;
+import rx.schedulers.Schedulers;
+
+/**
+ * Used for manual testing of memory leaks with recursive schedulers.
+ * 
+ */
+public class TestRecursionMemoryUsage {
+
+	public static void main(String args[]) {
+		usingFunc2(Schedulers.newThread());
+		usingAction0(Schedulers.newThread());
+
+		usingFunc2(Schedulers.currentThread());
+		usingAction0(Schedulers.currentThread());
+
+		usingFunc2(Schedulers.computation());
+		usingAction0(Schedulers.computation());
+
+		System.exit(0);
+	}
+
+	protected static void usingFunc2(final Scheduler scheduler) {
+		System.out.println("************ usingFunc2: " + scheduler);
+		Observable.create(new OnSubscribe<Long>() {
+
+			@Override
+			public void call(final Subscriber<? super Long> o) {
+				o.add(scheduler.schedule(new Action1<Inner>() {
+					long i = 0;
+
+					@Override
+					public void call(Inner inner) {
+						i++;
+						if (i % 500000 == 0) {
+							System.out.println(i + "  Total Memory: "
+									+ Runtime.getRuntime().totalMemory()
+									+ "  Free: "
+									+ Runtime.getRuntime().freeMemory());
+							o.onNext(i);
+						}
+						if (i == 100000000L) {
+							o.onCompleted();
+							return;
+						}
+
+						inner.schedule(this);
+					}
+				}));
+			}
+		}).toBlockingObservable().last();
+	}
+
+	protected static void usingAction0(final Scheduler scheduler) {
+		System.out.println("************ usingAction0: " + scheduler);
+		Observable.create(new OnSubscribe<Long>() {
+
+			@Override
+			public void call(final Subscriber<? super Long> o) {
+				o.add(scheduler.schedule(new Action1<Inner>() {
+
+					private long i = 0;
+
+					@Override
+					public void call(Inner inner) {
+						i++;
+						if (i % 500000 == 0) {
+							System.out.println(i + "  Total Memory: "
+									+ Runtime.getRuntime().totalMemory()
+									+ "  Free: "
+									+ Runtime.getRuntime().freeMemory());
+							o.onNext(i);
+						}
+						if (i == 100000000L) {
+							o.onCompleted();
+							return;
+						}
+						inner.schedule(this);
+					}
+				}));
+			}
+		}).toBlockingObservable().last();
+	}
+}
diff --git a/rxjava-core/src/perf/java/rx/archive/subjects/SubjectPerformanceTests.java b/rxjava-core/src/perf/java/rx/archive/subjects/SubjectPerformanceTests.java
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package rx.subjects;
+package rx.archive.subjects;
 
 import rx.Subscriber;
 import rx.functions.Action0;
+import rx.subjects.ReplaySubject;
 
 public class SubjectPerformanceTests {
 
diff --git a/rxjava-core/src/perf/java/rx/archive/subscriptions/CompositeSubscriptionAddRemovePerf.java b/rxjava-core/src/perf/java/rx/archive/subscriptions/CompositeSubscriptionAddRemovePerf.java
@@ -1,7 +1,9 @@
-package rx.subscriptions;
+package rx.archive.subscriptions;
 
+import rx.archive.perf.AbstractPerformanceTester;
 import rx.functions.Action0;
-import rx.perf.AbstractPerformanceTester;
+import rx.subscriptions.BooleanSubscription;
+import rx.subscriptions.CompositeSubscription;
 
 public class CompositeSubscriptionAddRemovePerf extends AbstractPerformanceTester {
 
diff --git a/rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java b/rxjava-core/src/perf/java/rx/operators/OperatorMapPerf.java
@@ -4,17 +4,21 @@
 import java.util.Collection;
 import java.util.concurrent.CountDownLatch;
 
-import org.openjdk.jmh.annotations.*;
-
+import org.openjdk.jmh.annotations.GenerateMicroBenchmark;
+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 rx.Observable;
 import rx.Observable.OnSubscribe;
 import rx.Observable.Operator;
 import rx.Observer;
 import rx.Subscriber;
 import rx.functions.Func1;
 
-public class ObservableBenchmark {
+public class OperatorMapPerf {
 
     @GenerateMicroBenchmark
     public void measureBaseline(BlackHole bh, Input input) {
diff --git a/rxjava-core/src/perf/java/rx/schedulers/TestRecursionMemoryUsage.java b/rxjava-core/src/perf/java/rx/schedulers/TestRecursionMemoryUsage.java
