From 0dfbd392225f8e4bc29da6bf879961614abecd20 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Tue, 4 Nov 2014 14:58:20 +0100
Subject: [PATCH] renamed HeadPipeline to OldHeadPipeline and marked as
deprecated
---
.../MethodCallThroughputAnalysis9.java | 6 +++---
.../MethodCallThroughputAnalysis10.java | 4 ++--
.../MethodCallThroughputAnalysis11.java | 6 +++---
.../MethodCallThroughputAnalysis14.java | 6 +++---
.../MethodCallThroughputAnalysis15.java | 12 ++++++------
.../MethodCallThroughputAnalysis16.java | 16 ++++++++--------
.../MethodCallThroughputAnalysis17.java | 14 +++++++-------
.../MethodCallThroughputAnalysis19.java | 14 +++++++-------
.../java/teetime/framework/HeadPipeline.java | 18 ------------------
.../teetime/framework/OldHeadPipeline.java | 19 +++++++++++++++++++
.../java/teetime/framework/OldPipeline.java | 1 +
11 files changed, 59 insertions(+), 57 deletions(-)
delete mode 100644 src/performancetest/java/teetime/framework/HeadPipeline.java
create mode 100644 src/performancetest/java/teetime/framework/OldHeadPipeline.java
diff --git a/src/performancetest/java/teetime/examples/experiment09/MethodCallThroughputAnalysis9.java b/src/performancetest/java/teetime/examples/experiment09/MethodCallThroughputAnalysis9.java
index cd600de6..882af15e 100644
--- a/src/performancetest/java/teetime/examples/experiment09/MethodCallThroughputAnalysis9.java
+++ b/src/performancetest/java/teetime/examples/experiment09/MethodCallThroughputAnalysis9.java
@@ -17,7 +17,7 @@ package teetime.examples.experiment09;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.HeadStage;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.CommittablePipe;
@@ -52,7 +52,7 @@ public class MethodCallThroughputAnalysis9 {
* @return
* @since 1.10
*/
- private HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline() {
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline() {
@SuppressWarnings("unchecked")
final NoopFilter<TimestampObject>[] noopFilters = new NoopFilter[this.numNoopFilters];
// create stages
@@ -64,7 +64,7 @@ public class MethodCallThroughputAnalysis9 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(this.timestampObjects);
- final HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/examples/experiment10/MethodCallThroughputAnalysis10.java b/src/performancetest/java/teetime/examples/experiment10/MethodCallThroughputAnalysis10.java
index 82a31ff2..6fac5159 100644
--- a/src/performancetest/java/teetime/examples/experiment10/MethodCallThroughputAnalysis10.java
+++ b/src/performancetest/java/teetime/examples/experiment10/MethodCallThroughputAnalysis10.java
@@ -17,7 +17,7 @@ package teetime.examples.experiment10;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.SingleElementPipe;
import teetime.stage.CollectorSink;
@@ -61,7 +61,7 @@ public class MethodCallThroughputAnalysis10 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(this.timestampObjects);
- final HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java b/src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java
index 07b681ab..e24c7d48 100644
--- a/src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java
+++ b/src/performancetest/java/teetime/examples/experiment11/MethodCallThroughputAnalysis11.java
@@ -17,7 +17,7 @@ package teetime.examples.experiment11;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.HeadStage;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.UnorderedGrowablePipe;
@@ -47,7 +47,7 @@ public class MethodCallThroughputAnalysis11 {
this.runnable = new RunnableStage(pipeline);
}
- private HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final long numInputObjects,
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final long numInputObjects,
final ConstructorClosure<TimestampObject> inputObjectCreator) {
@SuppressWarnings("unchecked")
final NoopFilter<TimestampObject>[] noopFilters = new NoopFilter[this.numNoopFilters];
@@ -62,7 +62,7 @@ public class MethodCallThroughputAnalysis11 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(this.timestampObjects);
- final HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java b/src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java
index e229ebc5..01de043b 100644
--- a/src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java
+++ b/src/performancetest/java/teetime/examples/experiment14/MethodCallThroughputAnalysis14.java
@@ -17,7 +17,7 @@ package teetime.examples.experiment14;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.HeadStage;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.IPipeFactory;
@@ -56,7 +56,7 @@ public class MethodCallThroughputAnalysis14 {
* @return
* @since 1.10
*/
- private HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline() {
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline() {
@SuppressWarnings("unchecked")
final NoopFilter<TimestampObject>[] noopFilters = new NoopFilter[this.numNoopFilters];
// create stages
@@ -68,7 +68,7 @@ public class MethodCallThroughputAnalysis14 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(this.timestampObjects);
- final HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/examples/experiment15/MethodCallThroughputAnalysis15.java b/src/performancetest/java/teetime/examples/experiment15/MethodCallThroughputAnalysis15.java
index 6850f50c..6b92bec5 100644
--- a/src/performancetest/java/teetime/examples/experiment15/MethodCallThroughputAnalysis15.java
+++ b/src/performancetest/java/teetime/examples/experiment15/MethodCallThroughputAnalysis15.java
@@ -17,7 +17,7 @@ package teetime.examples.experiment15;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.HeadStage;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.OrderedGrowableArrayPipe;
@@ -55,20 +55,20 @@ public class MethodCallThroughputAnalysis15 {
public void init() {
- HeadPipeline<Clock, Sink<Long>> clockPipeline = this.buildClockPipeline();
+ OldHeadPipeline<Clock, Sink<Long>> clockPipeline = this.buildClockPipeline();
this.clockRunnable = new RunnableStage(clockPipeline);
HeadStage pipeline = this.buildPipeline(this.clock);
this.runnable = new RunnableStage(pipeline);
}
- private HeadPipeline<Clock, Sink<Long>> buildClockPipeline() {
+ private OldHeadPipeline<Clock, Sink<Long>> buildClockPipeline() {
this.clock = new Clock();
this.clock.setInitialDelayInMs(100);
this.clock.setIntervalDelayInMs(100);
- final HeadPipeline<Clock, Sink<Long>> pipeline = new HeadPipeline<Clock, Sink<Long>>();
+ final OldHeadPipeline<Clock, Sink<Long>> pipeline = new OldHeadPipeline<Clock, Sink<Long>>();
pipeline.setFirstStage(this.clock);
pipeline.setLastStage(new Sink<Long>());
@@ -80,7 +80,7 @@ public class MethodCallThroughputAnalysis15 {
* @return
* @since 1.10
*/
- private HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final Clock clock) {
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final Clock clock) {
@SuppressWarnings("unchecked")
final NoopFilter<TimestampObject>[] noopFilters = new NoopFilter[this.numNoopFilters];
// create stages
@@ -93,7 +93,7 @@ public class MethodCallThroughputAnalysis15 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(this.timestampObjects);
- final HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/examples/experiment16/MethodCallThroughputAnalysis16.java b/src/performancetest/java/teetime/examples/experiment16/MethodCallThroughputAnalysis16.java
index c84c2bad..b48c2378 100644
--- a/src/performancetest/java/teetime/examples/experiment16/MethodCallThroughputAnalysis16.java
+++ b/src/performancetest/java/teetime/examples/experiment16/MethodCallThroughputAnalysis16.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.SingleElementPipe;
import teetime.framework.pipe.SpScPipe;
@@ -56,7 +56,7 @@ public class MethodCallThroughputAnalysis16 {
private int numWorkerThreads;
public void init() {
- HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> producerPipeline = this.buildProducerPipeline(this.numInputObjects,
+ OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> producerPipeline = this.buildProducerPipeline(this.numInputObjects,
this.inputObjectCreator);
this.producerThread = new Thread(new RunnableStage(producerPipeline));
@@ -67,17 +67,17 @@ public class MethodCallThroughputAnalysis16 {
List<TimestampObject> resultList = new ArrayList<TimestampObject>(this.numInputObjects);
this.timestampObjectsList.add(resultList);
- HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> workerPipeline = this.buildPipeline(producerPipeline, resultList);
+ OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> workerPipeline = this.buildPipeline(producerPipeline, resultList);
this.workerThreads[i] = new Thread(new RunnableStage(workerPipeline));
}
}
- private HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> buildProducerPipeline(final int numInputObjects,
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> buildProducerPipeline(final int numInputObjects,
final ConstructorClosure<TimestampObject> inputObjectCreator) {
final ObjectProducer<TimestampObject> objectProducer = new ObjectProducer<TimestampObject>(numInputObjects, inputObjectCreator);
Distributor<TimestampObject> distributor = new Distributor<TimestampObject>();
- final HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(distributor);
@@ -90,8 +90,8 @@ public class MethodCallThroughputAnalysis16 {
* @param numNoopFilters
* @since 1.10
*/
- private HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(
- final HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> previousStage,
+ private OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> previousStage,
final List<TimestampObject> timestampObjects) {
Relay<TimestampObject> relay = new Relay<TimestampObject>();
@SuppressWarnings("unchecked")
@@ -104,7 +104,7 @@ public class MethodCallThroughputAnalysis16 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(timestampObjects);
- final HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(relay);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java b/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java
index 62345de3..3496e46c 100644
--- a/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java
+++ b/src/performancetest/java/teetime/examples/experiment17/MethodCallThroughputAnalysis17.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.RunnableStage;
import teetime.framework.Stage;
import teetime.framework.pipe.DummyPipe;
@@ -60,7 +60,7 @@ public class MethodCallThroughputAnalysis17 {
private Thread[] workerThreads;
public void init() {
- HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> producerPipeline = this.buildProducerPipeline(this.numInputObjects,
+ OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> producerPipeline = this.buildProducerPipeline(this.numInputObjects,
this.inputObjectCreator);
this.producerThread = new Thread(new RunnableStage(producerPipeline));
@@ -71,7 +71,7 @@ public class MethodCallThroughputAnalysis17 {
List<TimestampObject> resultList = new ArrayList<TimestampObject>(this.numInputObjects);
this.timestampObjectsList.add(resultList);
- HeadPipeline<?, ?> pipeline = this.buildPipeline(null, resultList);
+ OldHeadPipeline<?, ?> pipeline = this.buildPipeline(null, resultList);
this.workerThreads[i] = new Thread(new RunnableStage(pipeline));
}
@@ -108,7 +108,7 @@ public class MethodCallThroughputAnalysis17 {
}
@SuppressWarnings("unchecked")
- private HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> buildProducerPipeline(final int numInputObjects,
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> buildProducerPipeline(final int numInputObjects,
final ConstructorClosure<TimestampObject> inputObjectCreator) {
final ObjectProducer<TimestampObject> objectProducer = new ObjectProducer<TimestampObject>(numInputObjects, inputObjectCreator);
Distributor<TimestampObject> distributor = new Distributor<TimestampObject>();
@@ -119,7 +119,7 @@ public class MethodCallThroughputAnalysis17 {
UnorderedGrowablePipe.connect(objectProducer.getOutputPort(), distributor.getInputPort());
distributor.getNewOutputPort().setPipe(new DummyPipe());
- final HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
// pipeline.setFirstStage(sink);
// pipeline.setFirstStage(endStage);
@@ -133,7 +133,7 @@ public class MethodCallThroughputAnalysis17 {
* @param numNoopFilters
* @since 1.10
*/
- private HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final Stage previousStage,
+ private OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> buildPipeline(final Stage previousStage,
final List<TimestampObject> timestampObjects) {
// create stages
Relay<TimestampObject> relay = new Relay<TimestampObject>();
@@ -158,7 +158,7 @@ public class MethodCallThroughputAnalysis17 {
UnorderedGrowablePipe.connect(noopFilters[noopFilters.length - 1].getOutputPort(), stopTimestampFilter.getInputPort());
UnorderedGrowablePipe.connect(stopTimestampFilter.getOutputPort(), collectorSink.getInputPort());
- final HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(relay);
pipeline.setLastStage(collectorSink);
return pipeline;
diff --git a/src/performancetest/java/teetime/examples/experiment19/MethodCallThroughputAnalysis19.java b/src/performancetest/java/teetime/examples/experiment19/MethodCallThroughputAnalysis19.java
index b91a703b..f38312f5 100644
--- a/src/performancetest/java/teetime/examples/experiment19/MethodCallThroughputAnalysis19.java
+++ b/src/performancetest/java/teetime/examples/experiment19/MethodCallThroughputAnalysis19.java
@@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
-import teetime.framework.HeadPipeline;
+import teetime.framework.OldHeadPipeline;
import teetime.framework.RunnableStage;
import teetime.framework.pipe.OrderedGrowableArrayPipe;
import teetime.framework.pipe.SpScPipe;
@@ -56,7 +56,7 @@ public class MethodCallThroughputAnalysis19 {
private int numWorkerThreads;
public void init() {
- HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> producerPipeline = this.buildProducerPipeline(this.numInputObjects,
+ OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> producerPipeline = this.buildProducerPipeline(this.numInputObjects,
this.inputObjectCreator);
this.producerThread = new Thread(new RunnableStage(producerPipeline));
@@ -67,18 +67,18 @@ public class MethodCallThroughputAnalysis19 {
List<TimestampObject> resultList = new ArrayList<TimestampObject>(this.numInputObjects);
this.timestampObjectsList.add(resultList);
- HeadPipeline<?, ?> pipeline = this.buildPipeline(producerPipeline.getLastStage(), resultList);
+ OldHeadPipeline<?, ?> pipeline = this.buildPipeline(producerPipeline.getLastStage(), resultList);
this.workerThreads[i] = new Thread(new RunnableStage(pipeline));
}
}
- private HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> buildProducerPipeline(final int numInputObjects,
+ private OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> buildProducerPipeline(final int numInputObjects,
final ConstructorClosure<TimestampObject> inputObjectCreator) {
final ObjectProducer<TimestampObject> objectProducer = new ObjectProducer<TimestampObject>(numInputObjects, inputObjectCreator);
Distributor<TimestampObject> distributor = new Distributor<TimestampObject>();
- final HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> pipeline = new HeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>>();
+ final OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>> pipeline = new OldHeadPipeline<ObjectProducer<TimestampObject>, Distributor<TimestampObject>>();
pipeline.setFirstStage(objectProducer);
pipeline.setLastStage(distributor);
@@ -87,7 +87,7 @@ public class MethodCallThroughputAnalysis19 {
return pipeline;
}
- private HeadPipeline<?, ?> buildPipeline(final Distributor<TimestampObject> previousStage, final List<TimestampObject> timestampObjects) {
+ private OldHeadPipeline<?, ?> buildPipeline(final Distributor<TimestampObject> previousStage, final List<TimestampObject> timestampObjects) {
Relay<TimestampObject> relay = new Relay<TimestampObject>();
@SuppressWarnings("unchecked")
final NoopFilter<TimestampObject>[] noopFilters = new NoopFilter[this.numNoopFilters];
@@ -99,7 +99,7 @@ public class MethodCallThroughputAnalysis19 {
final StopTimestampFilter stopTimestampFilter = new StopTimestampFilter();
final CollectorSink<TimestampObject> collectorSink = new CollectorSink<TimestampObject>(timestampObjects);
- final HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new HeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>>();
+ final OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>> pipeline = new OldHeadPipeline<Relay<TimestampObject>, CollectorSink<TimestampObject>>();
pipeline.setFirstStage(relay);
pipeline.setLastStage(collectorSink);
diff --git a/src/performancetest/java/teetime/framework/HeadPipeline.java b/src/performancetest/java/teetime/framework/HeadPipeline.java
deleted file mode 100644
index 293700a0..00000000
--- a/src/performancetest/java/teetime/framework/HeadPipeline.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package teetime.framework;
-
-public class HeadPipeline<FirstStage extends HeadStage, LastStage extends Stage> extends OldPipeline<FirstStage, LastStage> implements HeadStage {
-
- public HeadPipeline() {}
-
- public HeadPipeline(final String name) {}
-
- @Override
- public boolean shouldBeTerminated() {
- return this.firstStage.shouldBeTerminated();
- }
-
- @Override
- public void terminate() {
- this.firstStage.terminate();
- }
-}
diff --git a/src/performancetest/java/teetime/framework/OldHeadPipeline.java b/src/performancetest/java/teetime/framework/OldHeadPipeline.java
new file mode 100644
index 00000000..d3dd6414
--- /dev/null
+++ b/src/performancetest/java/teetime/framework/OldHeadPipeline.java
@@ -0,0 +1,19 @@
+package teetime.framework;
+
+@Deprecated
+public class OldHeadPipeline<FirstStage extends HeadStage, LastStage extends Stage> extends OldPipeline<FirstStage, LastStage> implements HeadStage {
+
+ public OldHeadPipeline() {}
+
+ public OldHeadPipeline(final String name) {}
+
+ @Override
+ public boolean shouldBeTerminated() {
+ return this.firstStage.shouldBeTerminated();
+ }
+
+ @Override
+ public void terminate() {
+ this.firstStage.terminate();
+ }
+}
diff --git a/src/performancetest/java/teetime/framework/OldPipeline.java b/src/performancetest/java/teetime/framework/OldPipeline.java
index 77b70577..11ff018d 100644
--- a/src/performancetest/java/teetime/framework/OldPipeline.java
+++ b/src/performancetest/java/teetime/framework/OldPipeline.java
@@ -5,6 +5,7 @@ import java.util.List;
import teetime.framework.signal.ISignal;
import teetime.framework.validation.InvalidPortConnection;
+@Deprecated
public class OldPipeline<FirstStage extends Stage, LastStage extends Stage> implements Stage {
protected FirstStage firstStage;
--
GitLab