diff --git a/src/main/java/teetime/util/StatisticsUtil.java b/src/main/java/teetime/util/StatisticsUtil.java
index 812bf767eb631b92e9b26ed05a8f7353e97c880e..4708e96f30ea0e13cb2458c141220a77da0ee1ff 100644
--- a/src/main/java/teetime/util/StatisticsUtil.java
+++ b/src/main/java/teetime/util/StatisticsUtil.java
@@ -70,7 +70,7 @@ public class StatisticsUtil {
performanceResult.avgDurInNs = avgDurInNs;
- printQuintiles(quintileValues);
+ System.out.println(getQuantilesString(quintileValues));
final long confidenceWidthInNs = StatisticsUtil.calculateConfidenceWidth(sortedDurationsInNs, avgDurInNs);
@@ -83,10 +83,14 @@ public class StatisticsUtil {
return performanceResult;
}
- public static void printQuintiles(final Map<Double, Long> quintileValues) {
- for (final Entry<Double, Long> entry : quintileValues.entrySet()) {
- System.out.println((entry.getKey() * 100) + " % : " + TimeUnit.NANOSECONDS.toNanos(entry.getValue()) + " ns");
+ public static String getQuantilesString(final Map<Double, Long> quantilesValues) {
+ StringBuilder builder = new StringBuilder();
+ for (final Entry<Double, Long> entry : quantilesValues.entrySet()) {
+ String quantile = (entry.getKey() * 100) + " % : " + TimeUnit.NANOSECONDS.toNanos(entry.getValue()) + " ns";
+ builder.append(quantile);
+ builder.append("\n");
}
+ return builder.toString();
}
public static long calculateConfidenceWidth(final List<Long> durations, final long avgDurInNs) {
diff --git a/src/main/java/teetime/util/list/CommittableResizableArrayQueue.java b/src/main/java/teetime/util/list/CommittableResizableArrayQueue.java
index 14fab9a8f10b8d4dc51fa96387d5137eb50f5ab0..6a6b2afe46b590f4cb5f94b32ec5b9988567b7fe 100644
--- a/src/main/java/teetime/util/list/CommittableResizableArrayQueue.java
+++ b/src/main/java/teetime/util/list/CommittableResizableArrayQueue.java
@@ -28,9 +28,9 @@ public class CommittableResizableArrayQueue<T> implements CommittableQueue<T> {
@Override
public void addToTailUncommitted(final T element) {
- // if (this.lastFreeIndexUncommitted == this.capacity()) { // TODO uncomment
- // this.grow();
- // }
+ if (this.lastFreeIndexUncommitted == this.capacity()) {
+ this.grow();
+ }
this.put(this.lastFreeIndexUncommitted++, element);
}
diff --git a/src/main/java/teetime/variant/methodcall/framework/core/Pipeline.java b/src/main/java/teetime/variant/methodcall/framework/core/Pipeline.java
index 57dcbbad5914469b13c373920d47f57d52ed1be5..71ae10fc0237f74aaf0311122854572325de3b3e 100644
--- a/src/main/java/teetime/variant/methodcall/framework/core/Pipeline.java
+++ b/src/main/java/teetime/variant/methodcall/framework/core/Pipeline.java
@@ -46,12 +46,16 @@ public class Pipeline<I, O> implements Stage<I, O> {
// below is faster than above (probably because of the instantiation of a list iterator in each (!) execution)
CommittableQueue queue = elements;
- // for (int i = this.startIndex; i < this.stages.length; i++) {
- // Stage<?, ?> stage = this.stages[i];
- // queue = stage.execute2(queue);
- // }
+ for (int i = 0; i < this.stages.length; i++) {
+ Stage<?, ?> stage = this.stages[i];
+ queue = stage.execute2(queue);
+ if (queue.isEmpty()) {
+ break;
+ }
+ }
+
+ // queue = this.firstStage.execute2(elements);
- queue = this.firstStage.execute2(elements);
this.setReschedulable(this.firstStage.isReschedulable());
return queue;
diff --git a/src/main/java/teetime/variant/methodcall/stage/CollectorSink.java b/src/main/java/teetime/variant/methodcall/stage/CollectorSink.java
index 49ea2928527b536a95a6037d5782d8a8182a19c3..1b2a8d3feb4886b8999571d9e77e4d78fccf4754 100644
--- a/src/main/java/teetime/variant/methodcall/stage/CollectorSink.java
+++ b/src/main/java/teetime/variant/methodcall/stage/CollectorSink.java
@@ -36,6 +36,7 @@ public class CollectorSink<T> extends ConsumerStage<T, Object> {
this.elements = list;
}
+ @SuppressWarnings("unchecked")
@Override
public Object execute(final Object element) {
this.elements.add((T) element);
@@ -57,10 +58,6 @@ public class CollectorSink<T> extends ConsumerStage<T, Object> {
if ((this.elements.size() % THRESHOLD) == 0) {
System.out.println("size: " + this.elements.size());
}
-
- if (this.elements.size() > 90000) {
- // System.out.println("size > 90000: " + this.elements.size());
- }
}
}
diff --git a/src/main/java/teetime/variant/methodcall/stage/NoopFilter.java b/src/main/java/teetime/variant/methodcall/stage/NoopFilter.java
index cdd4423708fcc71949351b161f0285b8d2bae983..5907267c5a331518c3d23bba80282b748b0af3b6 100644
--- a/src/main/java/teetime/variant/methodcall/stage/NoopFilter.java
+++ b/src/main/java/teetime/variant/methodcall/stage/NoopFilter.java
@@ -34,8 +34,7 @@ public class NoopFilter<T> extends ConsumerStage<T, T> {
@Override
protected void execute4(final CommittableQueue<T> elements) {
T element = elements.removeFromHead();
- // this.send(element); // "send" calls the next stage and so on
- throw new IllegalStateException();
+ this.send(element); // TODO ? "send" calls the next stage and so on
}
}
diff --git a/src/main/java/teetime/variant/methodcall/stage/ObjectProducer.java b/src/main/java/teetime/variant/methodcall/stage/ObjectProducer.java
index 540a81da2c2e4acc17dcd59a3be3c9b52cdd5aeb..1d580d362ae1f457f7912ec0ac9273993cb47d88 100644
--- a/src/main/java/teetime/variant/methodcall/stage/ObjectProducer.java
+++ b/src/main/java/teetime/variant/methodcall/stage/ObjectProducer.java
@@ -72,15 +72,16 @@ public class ObjectProducer<T> extends ProducerStage<Void, T> {
@Override
protected void execute4(final CommittableQueue<Void> elements) {
- T newObject = null;
- newObject = this.inputObjectCreator.create();
- this.numInputObjects--;
-
if (this.numInputObjects == 0) {
this.setReschedulable(false);
// this.getOutputPort().pipe.close();
+ return;
}
+ T newObject = null;
+ newObject = this.inputObjectCreator.create();
+ this.numInputObjects--;
+
// System.out.println(this.getClass().getSimpleName() + ": sending " + this.numInputObjects);
this.send(newObject);
// throw new IllegalStateException();
diff --git a/src/main/java/teetime/variant/methodcall/stage/StartTimestampFilter.java b/src/main/java/teetime/variant/methodcall/stage/StartTimestampFilter.java
index 754de3dcdfee1e41815293b55b7c4e18b64827d1..a83d1655af9cffcd5c30ab8100b48de0e1733d52 100644
--- a/src/main/java/teetime/variant/methodcall/stage/StartTimestampFilter.java
+++ b/src/main/java/teetime/variant/methodcall/stage/StartTimestampFilter.java
@@ -37,7 +37,6 @@ public class StartTimestampFilter extends ConsumerStage<TimestampObject, Timesta
protected void execute4(final CommittableQueue<TimestampObject> elements) {
TimestampObject element = elements.removeFromHead();
element.setStartTimestamp(System.nanoTime());
- // this.send(element);
- throw new IllegalStateException();
+ this.send(element);
}
}
diff --git a/src/main/java/teetime/variant/methodcall/stage/StopTimestampFilter.java b/src/main/java/teetime/variant/methodcall/stage/StopTimestampFilter.java
index b855088a68abd6ce1b9a5f2bb6648aa6f7c9fe65..1e36f5337346113c8f42036985e3e69287b4cb99 100644
--- a/src/main/java/teetime/variant/methodcall/stage/StopTimestampFilter.java
+++ b/src/main/java/teetime/variant/methodcall/stage/StopTimestampFilter.java
@@ -33,19 +33,11 @@ public class StopTimestampFilter extends ConsumerStage<TimestampObject, Timestam
return timestampObject;
}
- // @Override
- // public void execute3() {
- // TimestampObject element = this.getInputPort().receive();
- // element.setStopTimestamp(System.nanoTime());
- // // this.getOutputPort().send(element);
- // }
-
@Override
protected void execute4(final CommittableQueue<TimestampObject> elements) {
TimestampObject element = elements.removeFromHead();
element.setStopTimestamp(System.nanoTime());
- // this.send(element);
- throw new IllegalStateException();
+ this.send(element);
}
}
diff --git a/src/test/java/teetime/util/StopWatchTest.java b/src/test/java/teetime/util/StopWatchTest.java
index 8923df350d3ce95f28b157e9c8f16645ff5354b7..d61450e94cae54200a9600e5c47497f6620958a5 100644
--- a/src/test/java/teetime/util/StopWatchTest.java
+++ b/src/test/java/teetime/util/StopWatchTest.java
@@ -24,7 +24,7 @@ public class StopWatchTest {
}
Map<Double, Long> quintiles = StatisticsUtil.calculateQuintiles(durationsInNs);
- StatisticsUtil.printQuintiles(quintiles);
+ StatisticsUtil.getQuantilesString(quintiles);
}
public static BigInteger fib(final BigInteger n) {
diff --git a/src/test/java/teetime/variant/methodcall/examples/AllTests.java b/src/test/java/teetime/variant/methodcall/examples/AllTests.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d32ae9a800e1f5255108f731abed7f998b97102
--- /dev/null
+++ b/src/test/java/teetime/variant/methodcall/examples/AllTests.java
@@ -0,0 +1,80 @@
+package teetime.variant.methodcall.examples;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.junit.AfterClass;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+import teetime.variant.methodcall.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test;
+import teetime.variant.methodcall.examples.experiment02.MethodCallThoughputTimestampAnalysis2Test;
+import teetime.variant.methodcall.examples.experiment03.MethodCallThoughputTimestampAnalysis3Test;
+import teetime.variant.methodcall.examples.experiment04.MethodCallThoughputTimestampAnalysis4Test;
+import teetime.variant.methodcall.examples.experiment05.MethodCallThoughputTimestampAnalysis5Test;
+import teetime.variant.methodcall.examples.experiment06.MethodCallThoughputTimestampAnalysis6Test;
+import teetime.variant.methodcall.examples.experiment07.MethodCallThoughputTimestampAnalysis7Test;
+import teetime.variant.methodcall.examples.experiment08.MethodCallThoughputTimestampAnalysis8Test;
+import teetime.variant.methodcall.examples.experiment12.MethodCallThoughputTimestampAnalysis12Test;
+import teetime.variant.methodcall.examples.experiment13.MethodCallThoughputTimestampAnalysis13Test;
+import test.PerformanceResult;
+import test.PerformanceTest;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ MethodCallThoughputTimestampAnalysis1Test.class,
+ MethodCallThoughputTimestampAnalysis2Test.class,
+ MethodCallThoughputTimestampAnalysis3Test.class,
+ MethodCallThoughputTimestampAnalysis4Test.class,
+ MethodCallThoughputTimestampAnalysis5Test.class,
+ MethodCallThoughputTimestampAnalysis6Test.class,
+ MethodCallThoughputTimestampAnalysis7Test.class,
+ MethodCallThoughputTimestampAnalysis8Test.class,
+ MethodCallThoughputTimestampAnalysis12Test.class,
+ MethodCallThoughputTimestampAnalysis13Test.class,
+})
+public class AllTests {
+
+ @AfterClass
+ public static void doYourOneTimeTeardown() {
+ Map<String, PerformanceResult> performanceResults = PerformanceTest.measurementRepository.performanceResults;
+ for (Entry<String, PerformanceResult> entry : performanceResults.entrySet()) {
+ System.out.println("---> " + entry.getKey() + "\n" + entry.getValue());
+ }
+
+ PerformanceResult test1 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment01.MethodCallThoughputTimestampAnalysis1Test)");
+ PerformanceResult test4 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment04.MethodCallThoughputTimestampAnalysis4Test)");
+ PerformanceResult test7 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment07.MethodCallThoughputTimestampAnalysis7Test)");
+ PerformanceResult test3 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment03.MethodCallThoughputTimestampAnalysis3Test)");
+ PerformanceResult test8 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment08.MethodCallThoughputTimestampAnalysis8Test)");
+ PerformanceResult test12 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment12.MethodCallThoughputTimestampAnalysis12Test)");
+ PerformanceResult test13 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment13.MethodCallThoughputTimestampAnalysis13Test)");
+ PerformanceResult test5 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment05.MethodCallThoughputTimestampAnalysis5Test)");
+ PerformanceResult test2 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment02.MethodCallThoughputTimestampAnalysis2Test)");
+ PerformanceResult test6 = performanceResults
+ .get("testWithManyObjects(teetime.variant.methodcall.examples.experiment06.MethodCallThoughputTimestampAnalysis6Test)");
+
+ assertEquals(1, (double) test4.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(2, (double) test7.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(3, (double) test3.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(3, (double) test8.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(7, (double) test12.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(7, (double) test13.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(9, (double) test5.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(17, (double) test2.quantiles.get(0.5) / test1.quantiles.get(0.5), 0.1);
+ assertEquals(59, (double) test6.quantiles.get(0.5) / test1.quantiles.get(0.5), 1.1);
+ }
+
+}
diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java b/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java
index 59743fcd55434adea3aef91dce03d8576c55ba7b..20da6308b0d28b60d623d267f3a84a07b9b74e80 100644
--- a/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java
+++ b/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThoughputTimestampAnalysis2Test.java
@@ -28,9 +28,6 @@ import test.PerformanceTest;
*/
public class MethodCallThoughputTimestampAnalysis2Test extends PerformanceTest {
- // 500 times faster than our new framework
- // TODO check why
-
@Test
public void testWithManyObjects() {
System.out.println("Testing teetime (mc) with NUM_OBJECTS_TO_CREATE=" + NUM_OBJECTS_TO_CREATE + ", NUM_NOOP_FILTERS="
diff --git a/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThroughputAnalysis2.java b/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThroughputAnalysis2.java
index 85eaebcad1f8457e3f6689f8e847b3b82cc5ec4c..4baa051d63747a980130cfacf5a5db0b0ec8362e 100644
--- a/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThroughputAnalysis2.java
+++ b/src/test/java/teetime/variant/methodcall/examples/experiment02/MethodCallThroughputAnalysis2.java
@@ -77,10 +77,8 @@ public class MethodCallThroughputAnalysis2 extends Analysis {
@Override
public void run() {
CommittableQueue<Void> inputQueue = new CommittableResizableArrayQueue<Void>(null, 0);
- CommittableQueue<Object> outputQueue = new CommittableResizableArrayQueue<Object>(null, 0);
-
do {
- outputQueue = pipeline.execute2(inputQueue);
+ pipeline.execute2(inputQueue);
} while (pipeline.isReschedulable());
}
};
diff --git a/src/test/java/test/PerformanceResult.java b/src/test/java/test/PerformanceResult.java
index a6a5b1a7902b79a95cc0b41a8d43c05f2703f2f4..34f94507a6193ba09712b6285800a8f64cb926d6 100644
--- a/src/test/java/test/PerformanceResult.java
+++ b/src/test/java/test/PerformanceResult.java
@@ -2,6 +2,8 @@ package test;
import java.util.Map;
+import teetime.util.StatisticsUtil;
+
public class PerformanceResult {
public long sumInNs;
@@ -9,4 +11,23 @@ public class PerformanceResult {
public long avgDurInNs;
public long confidenceWidthInNs;
+ @Override
+ public String toString() {
+ StringBuilder stringBuilder = new StringBuilder();
+ stringBuilder.append("sumInNs: ");
+ stringBuilder.append(this.sumInNs);
+ stringBuilder.append("\n");
+
+ stringBuilder.append("avgDurInNs: ");
+ stringBuilder.append(this.avgDurInNs);
+ stringBuilder.append("\n");
+
+ stringBuilder.append("confidenceWidthInNs: ");
+ stringBuilder.append(this.confidenceWidthInNs);
+ stringBuilder.append("\n");
+
+ stringBuilder.append(StatisticsUtil.getQuantilesString(this.quantiles));
+
+ return stringBuilder.toString();
+ }
}
diff --git a/src/test/java/test/PerformanceTest.java b/src/test/java/test/PerformanceTest.java
index 910053b08feb75fd0fba2389732628f31e6f84cd..d3982b48dd58c7a3ec87b6555bfabe907a35a36a 100644
--- a/src/test/java/test/PerformanceTest.java
+++ b/src/test/java/test/PerformanceTest.java
@@ -21,7 +21,7 @@ public abstract class PerformanceTest {
protected static final int NUM_OBJECTS_TO_CREATE = 100000;
protected static final int NUM_NOOP_FILTERS = 800;
- private static MeasurementRepository measurementRepository = new MeasurementRepository();
+ public static final MeasurementRepository measurementRepository = new MeasurementRepository();
private Description description;