From b2dc727aeaa6b93ffc3bd9a22033988d51b68fde Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Wed, 26 Aug 2015 11:04:47 +0200
Subject: [PATCH] adopted API changes
---
.../recordReader/RecordReaderConfiguration.java | 2 +-
.../TcpTraceLoggingExtAnalysisConfiguration.java | 4 ++--
.../TcpTraceReconstructionConf.java | 12 ++++++------
.../traceReconstruction/TraceReconstructionConf.java | 6 +++---
...constructionAnalysisWithThreadsConfiguration.java | 12 ++++++------
...aceReductionAnalysisWithThreadsConfiguration.java | 12 ++++++------
.../stage/io/filesystem/Dir2RecordsFilterTest.java | 2 +-
7 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java b/src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java
index 3cd2b207..f50b5220 100644
--- a/src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java
+++ b/src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java
@@ -43,7 +43,7 @@ public class RecordReaderConfiguration extends Configuration {
private void buildConfiguration() {
final Stage producerPipeline = this.buildProducerPipeline();
- addThreadableStage(producerPipeline);
+ declareActive(producerPipeline);
}
private Stage buildProducerPipeline() {
diff --git a/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java b/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
index 5b8c52a0..1e145c27 100644
--- a/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
@@ -40,9 +40,9 @@ public class TcpTraceLoggingExtAnalysisConfiguration extends Configuration {
private void init() {
final Pipeline<Distributor<Long>> clockPipeline = this.buildClockPipeline(1000);
- addThreadableStage(clockPipeline.getFirstStage());
+ declareActive(clockPipeline.getFirstStage());
final Stage tcpPipeline = this.buildTcpPipeline(clockPipeline.getLastStage());
- addThreadableStage(tcpPipeline);
+ declareActive(tcpPipeline);
}
private Pipeline<Distributor<Long>> buildClockPipeline(final long intervalDelayInMs) {
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java b/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java
index b5e54e10..c05eb5a6 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/TcpTraceReconstructionConf.java
@@ -54,13 +54,13 @@ public class TcpTraceReconstructionConf extends Configuration {
private void init() {
Pipeline<Distributor<Long>> clockStage = this.buildClockPipeline(1000);
- addThreadableStage(clockStage.getFirstStage());
+ declareActive(clockStage.getFirstStage());
Pipeline<Distributor<Long>> clock2Stage = this.buildClockPipeline(2000);
- addThreadableStage(clock2Stage.getFirstStage());
+ declareActive(clock2Stage.getFirstStage());
Stage pipeline = this.buildPipeline(clockStage.getLastStage(), clock2Stage.getLastStage());
- addThreadableStage(pipeline);
+ declareActive(pipeline);
}
private Pipeline<Distributor<Long>> buildClockPipeline(final long intervalDelayInMs) {
@@ -88,12 +88,12 @@ public class TcpTraceReconstructionConf extends Configuration {
// connect stages
connectPorts(tcpReader.getOutputPort(), this.recordCounter.getInputPort(), TCP_RELAY_MAX_SIZE);
connectPorts(this.recordCounter.getOutputPort(), instanceOfFilter.getInputPort());
- // connectIntraThreads(instanceOfFilter.getOutputPort(), this.recordThroughputFilter.getInputPort());
- // connectIntraThreads(this.recordThroughputFilter.getOutputPort(), traceReconstructionFilter.getInputPort());
+ // connectPorts(instanceOfFilter.getOutputPort(), this.recordThroughputFilter.getInputPort());
+ // connectPorts(this.recordThroughputFilter.getOutputPort(), traceReconstructionFilter.getInputPort());
connectPorts(instanceOfFilter.getMatchedOutputPort(), traceReconstructionFilter.getInputPort());
connectPorts(traceReconstructionFilter.getTraceValidOutputPort(), this.traceThroughputFilter.getInputPort());
connectPorts(this.traceThroughputFilter.getOutputPort(), this.traceCounter.getInputPort());
- // connectIntraThreads(traceReconstructionFilter.getTraceValidOutputPort(), this.traceCounter.getInputPort());
+ // connectPorts(traceReconstructionFilter.getTraceValidOutputPort(), this.traceCounter.getInputPort());
connectPorts(this.traceCounter.getOutputPort(), endStage.getInputPort());
connectPorts(clockStage.getNewOutputPort(), this.recordThroughputFilter.getTriggerInputPort(), 10);
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/TraceReconstructionConf.java b/src/performancetest/java/teetime/examples/traceReconstruction/TraceReconstructionConf.java
index 9210ee16..0afcb050 100644
--- a/src/performancetest/java/teetime/examples/traceReconstruction/TraceReconstructionConf.java
+++ b/src/performancetest/java/teetime/examples/traceReconstruction/TraceReconstructionConf.java
@@ -62,10 +62,10 @@ public class TraceReconstructionConf extends Configuration {
private void init() {
Clock clockStage = this.buildClockPipeline();
- addThreadableStage(clockStage);
+ declareActive(clockStage);
Stage pipeline = this.buildPipeline(clockStage);
- addThreadableStage(pipeline);
+ declareActive(pipeline);
}
private Clock buildClockPipeline() {
@@ -105,7 +105,7 @@ public class TraceReconstructionConf extends Configuration {
connectPorts(stringBufferFilter.getOutputPort(), instanceOfFilter.getInputPort());
connectPorts(instanceOfFilter.getMatchedOutputPort(), this.throughputFilter.getInputPort());
connectPorts(this.throughputFilter.getOutputPort(), traceReconstructionFilter.getInputPort());
- // connectIntraThreads(instanceOfFilter.getOutputPort(), traceReconstructionFilter.getInputPort());
+ // connectPorts(instanceOfFilter.getOutputPort(), traceReconstructionFilter.getInputPort());
connectPorts(traceReconstructionFilter.getTraceValidOutputPort(), merger.getNewInputPort());
connectPorts(traceReconstructionFilter.getTraceInvalidOutputPort(), merger.getNewInputPort());
connectPorts(merger.getOutputPort(), this.traceCounter.getInputPort());
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
index b7ca516c..6484124b 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
@@ -92,17 +92,17 @@ public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Conf
private void init() {
Pipeline<Distributor<IMonitoringRecord>> tcpPipeline = this.buildTcpPipeline();
- addThreadableStage(tcpPipeline.getFirstStage());
+ declareActive(tcpPipeline.getFirstStage());
Pipeline<Distributor<Long>> clockStage = this.buildClockPipeline(1000);
- addThreadableStage(clockStage.getFirstStage());
+ declareActive(clockStage.getFirstStage());
Pipeline<Distributor<Long>> clock2Stage = this.buildClockPipeline(2000);
- addThreadableStage(clock2Stage.getFirstStage());
+ declareActive(clock2Stage.getFirstStage());
for (int i = 0; i < this.numWorkerThreads; i++) {
Stage pipeline = this.buildPipeline(tcpPipeline.getLastStage(), clockStage.getLastStage(), clock2Stage.getLastStage());
- addThreadableStage(pipeline);
+ declareActive(pipeline);
}
}
@@ -187,8 +187,8 @@ public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Conf
connectPorts(traceMetadataCounter.getOutputPort(), instanceOfFilter.getInputPort());
connectPorts(instanceOfFilter.getMatchedOutputPort(), traceReconstructionFilter.getInputPort());
connectPorts(traceReconstructionFilter.getTraceValidOutputPort(), traceCounter.getInputPort());
- // connectIntraThreads(traceReconstructionFilter.getOutputPort(), traceThroughputFilter.getInputPort());
- // connectIntraThreads(traceThroughputFilter.getOutputPort(), traceCounter.getInputPort());
+ // connectPorts(traceReconstructionFilter.getOutputPort(), traceThroughputFilter.getInputPort());
+ // connectPorts(traceThroughputFilter.getOutputPort(), traceCounter.getInputPort());
connectPorts(traceCounter.getOutputPort(), endStage.getInputPort());
return relay;
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
index 1f4a36bb..ebea3fcd 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
@@ -88,17 +88,17 @@ public class TcpTraceReductionAnalysisWithThreadsConfiguration extends Configura
private void init() {
final Pipeline<Distributor<IMonitoringRecord>> tcpPipeline = this.buildTcpPipeline();
- addThreadableStage(tcpPipeline.getFirstStage());
+ declareActive(tcpPipeline.getFirstStage());
final Pipeline<Distributor<Long>> clockStage = this.buildClockPipeline(1000);
- addThreadableStage(clockStage.getFirstStage());
+ declareActive(clockStage.getFirstStage());
final Pipeline<Distributor<Long>> clock2Stage = this.buildClockPipeline(5000);
- addThreadableStage(clock2Stage.getFirstStage());
+ declareActive(clock2Stage.getFirstStage());
for (int i = 0; i < this.numWorkerThreads; i++) {
final Stage pipeline = this.buildPipeline(tcpPipeline, clockStage, clock2Stage);
- addThreadableStage(pipeline);
+ declareActive(pipeline);
}
}
@@ -186,8 +186,8 @@ public class TcpTraceReductionAnalysisWithThreadsConfiguration extends Configura
connectPorts(traceCounter.getOutputPort(), traceThroughputFilter.getInputPort());
connectPorts(traceThroughputFilter.getOutputPort(), endStage.getInputPort());
- // connectIntraThreads(traceReconstructionFilter.getOutputPort(), traceThroughputFilter.getInputPort());
- // connectIntraThreads(traceThroughputFilter.getOutputPort(), endStage.getInputPort());
+ // connectPorts(traceReconstructionFilter.getOutputPort(), traceThroughputFilter.getInputPort());
+ // connectPorts(traceThroughputFilter.getOutputPort(), endStage.getInputPort());
connectPorts(clock2Stage.getLastStage().getNewOutputPort(), traceReductionFilter.getTriggerInputPort(), 10);
connectPorts(clockStage.getLastStage().getNewOutputPort(), traceThroughputFilter.getTriggerInputPort(), 10);
diff --git a/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java b/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
index b9191f99..dc3f1d32 100644
--- a/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
+++ b/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
@@ -52,7 +52,7 @@ public class Dir2RecordsFilterTest {
this.reader = new Dir2RecordsFilter(new ClassNameRegistryRepository());
connectPorts(this.producer.getOutputPort(), this.reader.getInputPort());
- addThreadableStage(producer);
+ declareActive(producer);
}
public OutputPort<IMonitoringRecord> getOutputPort() {
--
GitLab