From adfd402ee7de797228c7f499c9017a363f1d7cc8 Mon Sep 17 00:00:00 2001
From: Nelson Tavares de Sousa <stu103017@mail.uni-kiel.de>
Date: Thu, 17 Sep 2015 14:10:00 +0200
Subject: [PATCH] adopted api changes (moved-declareActive)
---
.../examples/recordReader/RecordReaderConfiguration.java | 2 +-
.../TcpTraceLoggingExtAnalysisConfiguration.java | 4 ++--
.../traceReconstruction/TcpTraceReconstructionConf.java | 6 +++---
.../traceReconstruction/TraceReconstructionConf.java | 4 ++--
...aceReconstructionAnalysisWithThreadsConfiguration.java | 8 ++++----
...TcpTraceReductionAnalysisWithThreadsConfiguration.java | 8 ++++----
.../stage/io/filesystem/Dir2RecordsFilterTest.java | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java b/src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java
index 6c985058..252a8681 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 AbstractStage producerPipeline = this.buildProducerPipeline();
- declareActive(producerPipeline);
+ producerPipeline.declareActive();
}
private AbstractStage buildProducerPipeline() {
diff --git a/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java b/src/performancetest/java/teetime/examples/traceReading/TcpTraceLoggingExtAnalysisConfiguration.java
index d624114a..6bbd6cec 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);
- declareActive(clockPipeline.getFirstStage());
+ clockPipeline.getFirstStage().declareActive();
final AbstractStage tcpPipeline = this.buildTcpPipeline(clockPipeline.getLastStage());
- declareActive(tcpPipeline);
+ tcpPipeline.declareActive();
}
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 c84dd0a1..9d47f91a 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);
- declareActive(clockStage.getFirstStage());
+ clockStage.getFirstStage().declareActive();
Pipeline<Distributor<Long>> clock2Stage = this.buildClockPipeline(2000);
- declareActive(clock2Stage.getFirstStage());
+ clock2Stage.getFirstStage().declareActive();
AbstractStage pipeline = this.buildPipeline(clockStage.getLastStage(), clock2Stage.getLastStage());
- declareActive(pipeline);
+ pipeline.declareActive();
}
private Pipeline<Distributor<Long>> buildClockPipeline(final long intervalDelayInMs) {
diff --git a/src/performancetest/java/teetime/examples/traceReconstruction/TraceReconstructionConf.java b/src/performancetest/java/teetime/examples/traceReconstruction/TraceReconstructionConf.java
index 717ff484..41013990 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();
- declareActive(clockStage);
+ clockStage.declareActive();
AbstractStage pipeline = this.buildPipeline(clockStage);
- declareActive(pipeline);
+ pipeline.declareActive();
}
private Clock buildClockPipeline() {
diff --git a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
index 47a284c7..18517fa8 100644
--- a/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReconstructionWithThreads/TcpTraceReconstructionAnalysisWithThreadsConfiguration.java
@@ -91,17 +91,17 @@ public class TcpTraceReconstructionAnalysisWithThreadsConfiguration extends Conf
private void init() {
Pipeline<Distributor<IMonitoringRecord>> tcpPipeline = this.buildTcpPipeline();
- declareActive(tcpPipeline.getFirstStage());
+ tcpPipeline.getFirstStage().declareActive();
Pipeline<Distributor<Long>> clockStage = this.buildClockPipeline(1000);
- declareActive(clockStage.getFirstStage());
+ clockStage.getFirstStage().declareActive();
Pipeline<Distributor<Long>> clock2Stage = this.buildClockPipeline(2000);
- declareActive(clock2Stage.getFirstStage());
+ clock2Stage.getFirstStage().declareActive();
for (int i = 0; i < this.numWorkerThreads; i++) {
AbstractStage pipeline = this.buildPipeline(tcpPipeline.getLastStage(), clockStage.getLastStage(), clock2Stage.getLastStage());
- declareActive(pipeline);
+ pipeline.declareActive();
}
}
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
index 60672438..5029ae83 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/TcpTraceReductionAnalysisWithThreadsConfiguration.java
@@ -87,17 +87,17 @@ public class TcpTraceReductionAnalysisWithThreadsConfiguration extends Configura
private void init() {
final Pipeline<Distributor<IMonitoringRecord>> tcpPipeline = this.buildTcpPipeline();
- declareActive(tcpPipeline.getFirstStage());
+ tcpPipeline.getFirstStage().declareActive();
final Pipeline<Distributor<Long>> clockStage = this.buildClockPipeline(1000);
- declareActive(clockStage.getFirstStage());
+ clockStage.getFirstStage().declareActive();
final Pipeline<Distributor<Long>> clock2Stage = this.buildClockPipeline(5000);
- declareActive(clock2Stage.getFirstStage());
+ clock2Stage.getFirstStage().declareActive();
for (int i = 0; i < this.numWorkerThreads; i++) {
final AbstractStage pipeline = this.buildPipeline(tcpPipeline, clockStage, clock2Stage);
- declareActive(pipeline);
+ pipeline.declareActive();
}
}
diff --git a/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java b/src/test/java/teetime/stage/io/filesystem/Dir2RecordsFilterTest.java
index 486bba06..f202e5ee 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());
- declareActive(producer);
+ producer.declareActive();
}
public OutputPort<IMonitoringRecord> getOutputPort() {
--
GitLab