diff --git a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/HeadPipeline.java b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/HeadPipeline.java index f4e3e8678bcff46771ae511083a2fdf8a9682ebe..2f57679e884929f69a866e9ea7003fbabf7e7eb0 100644 --- a/src/main/java/teetime/variant/methodcallWithPorts/framework/core/HeadPipeline.java +++ b/src/main/java/teetime/variant/methodcallWithPorts/framework/core/HeadPipeline.java @@ -2,6 +2,10 @@ package teetime.variant.methodcallWithPorts.framework.core; public class HeadPipeline<FirstStage extends HeadStage, LastStage extends StageWithPort> extends Pipeline<FirstStage, LastStage> implements HeadStage { + public HeadPipeline() {} + + public HeadPipeline(final String name) {} + @Override public boolean shouldBeTerminated() { return this.firstStage.shouldBeTerminated(); diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceLoggingExplorviz.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceLoggingExplorviz.java index 91a6a5aeda5076e4f317d2fab82f5ed9056afece..d81ab05b49eb620fce45c658813cb824b25f925a 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceLoggingExplorviz.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceLoggingExplorviz.java @@ -2,8 +2,8 @@ package teetime.variant.methodcallWithPorts.examples.kiekerdays; import teetime.variant.explicitScheduling.framework.core.Analysis; import teetime.variant.methodcallWithPorts.framework.core.HeadPipeline; +import teetime.variant.methodcallWithPorts.framework.core.HeadStage; import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; -import teetime.variant.methodcallWithPorts.framework.core.StageWithPort; import teetime.variant.methodcallWithPorts.framework.core.pipe.SingleElementPipe; import teetime.variant.methodcallWithPorts.stage.basic.Sink; import teetime.variant.methodcallWithPorts.stage.explorviz.KiekerRecordTcpReader; @@ -17,7 +17,7 @@ public class TcpTraceLoggingExplorviz extends Analysis { @Override public void init() { super.init(); - StageWithPort tcpPipeline = this.buildTcpPipeline(); + HeadStage tcpPipeline = this.buildTcpPipeline(); this.tcpThread = new Thread(new RunnableStage(tcpPipeline)); } @@ -34,7 +34,7 @@ public class TcpTraceLoggingExplorviz extends Analysis { } } - private StageWithPort buildTcpPipeline() { + private HeadStage buildTcpPipeline() { KiekerRecordTcpReader tcpReader = new KiekerRecordTcpReader(); Sink<IMonitoringRecord> endStage = new Sink<IMonitoringRecord>(); diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReconstruction.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReconstruction.java index 538c20c1defd3d8453ac18aa535d77d525611a53..f6967ff1c036d2000f55f3a0c3df1f21612bbd29 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReconstruction.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReconstruction.java @@ -8,8 +8,8 @@ import teetime.util.concurrent.hashmap.ConcurrentHashMapWithDefault; import teetime.util.concurrent.hashmap.TraceBuffer; import teetime.variant.explicitScheduling.framework.core.Analysis; import teetime.variant.methodcallWithPorts.framework.core.HeadPipeline; +import teetime.variant.methodcallWithPorts.framework.core.HeadStage; import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; -import teetime.variant.methodcallWithPorts.framework.core.StageWithPort; import teetime.variant.methodcallWithPorts.framework.core.pipe.SingleElementPipe; import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; import teetime.variant.methodcallWithPorts.stage.InstanceOfFilter; @@ -48,7 +48,7 @@ public class TcpTraceReconstruction extends Analysis { this.workerThreads = new Thread[this.numWorkerThreads]; for (int i = 0; i < this.workerThreads.length; i++) { - StageWithPort pipeline = this.buildPipeline(tcpPipeline.getLastStage()); + HeadStage pipeline = this.buildPipeline(tcpPipeline.getLastStage()); this.workerThreads[i] = new Thread(new RunnableStage(pipeline)); } } @@ -66,7 +66,7 @@ public class TcpTraceReconstruction extends Analysis { return pipeline; } - private StageWithPort buildPipeline(final Distributor<IMonitoringRecord> tcpReaderPipeline) { + private HeadStage buildPipeline(final Distributor<IMonitoringRecord> tcpReaderPipeline) { // create stages Relay<IMonitoringRecord> relay = new Relay<IMonitoringRecord>(); final InstanceOfFilter<IMonitoringRecord, IFlowRecord> instanceOfFilter = new InstanceOfFilter<IMonitoringRecord, IFlowRecord>( @@ -85,8 +85,6 @@ public class TcpTraceReconstruction extends Analysis { // create and configure pipeline HeadPipeline<Relay<IMonitoringRecord>, Sink<TraceEventRecords>> pipeline = new HeadPipeline<Relay<IMonitoringRecord>, Sink<TraceEventRecords>>(); pipeline.setFirstStage(relay); - pipeline.addIntermediateStage(instanceOfFilter); - pipeline.addIntermediateStage(traceReconstructionFilter); pipeline.setLastStage(endStage); return pipeline; } diff --git a/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReduction.java b/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReduction.java index a38bf7d6b00728f847b9ad87f14b9c014f15e8d0..f04cdfc8ca22448f12b90587b45f47eebefdc316 100644 --- a/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReduction.java +++ b/src/test/java/teetime/variant/methodcallWithPorts/examples/kiekerdays/TcpTraceReduction.java @@ -10,8 +10,8 @@ import teetime.util.concurrent.hashmap.ConcurrentHashMapWithDefault; import teetime.util.concurrent.hashmap.TraceBuffer; import teetime.variant.explicitScheduling.framework.core.Analysis; import teetime.variant.methodcallWithPorts.framework.core.HeadPipeline; +import teetime.variant.methodcallWithPorts.framework.core.HeadStage; import teetime.variant.methodcallWithPorts.framework.core.RunnableStage; -import teetime.variant.methodcallWithPorts.framework.core.StageWithPort; import teetime.variant.methodcallWithPorts.framework.core.pipe.SingleElementPipe; import teetime.variant.methodcallWithPorts.framework.core.pipe.SpScPipe; import teetime.variant.methodcallWithPorts.stage.Clock; @@ -59,7 +59,7 @@ public class TcpTraceReduction extends Analysis { this.workerThreads = new Thread[this.numWorkerThreads]; for (int i = 0; i < this.workerThreads.length; i++) { - StageWithPort pipeline = this.buildPipeline(tcpPipeline.getLastStage(), clockStage.getLastStage()); + HeadStage pipeline = this.buildPipeline(tcpPipeline.getLastStage(), clockStage.getLastStage()); this.workerThreads[i] = new Thread(new RunnableStage(pipeline)); } } @@ -92,7 +92,7 @@ public class TcpTraceReduction extends Analysis { return pipeline; } - private StageWithPort buildPipeline(final Distributor<IMonitoringRecord> tcpReaderPipeline, final Distributor<Long> clockStage) { + private HeadStage buildPipeline(final Distributor<IMonitoringRecord> tcpReaderPipeline, final Distributor<Long> clockStage) { // create stages Relay<IMonitoringRecord> relay = new Relay<IMonitoringRecord>(); final InstanceOfFilter<IMonitoringRecord, IFlowRecord> instanceOfFilter = new InstanceOfFilter<IMonitoringRecord, IFlowRecord>( @@ -115,9 +115,6 @@ public class TcpTraceReduction extends Analysis { // create and configure pipeline HeadPipeline<Relay<IMonitoringRecord>, Sink<TraceEventRecords>> pipeline = new HeadPipeline<Relay<IMonitoringRecord>, Sink<TraceEventRecords>>(); pipeline.setFirstStage(relay); - pipeline.addIntermediateStage(instanceOfFilter); - pipeline.addIntermediateStage(traceReconstructionFilter); - pipeline.addIntermediateStage(traceReductionFilter); pipeline.setLastStage(endStage); return pipeline; }