Skip to content
Snippets Groups Projects
Commit 46d75a15 authored by Christian Wulf's avatar Christian Wulf
Browse files

Moved PipeFactoryRegistry to AnalysisConfiguration

parent d64de9b3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 27 deletions
src/main/java/teetime/framework/AnalysisConfiguration.java
+ 4
− 0
View file @ 46d75a15
...@@ -3,8 +3,12 @@ package teetime.framework; ...@@ -3,8 +3,12 @@ package teetime.framework;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import teetime.framework.pipe.PipeFactoryRegistry;
public class AnalysisConfiguration { public class AnalysisConfiguration {
protected static final PipeFactoryRegistry PIPE_FACTORY_REGISTRY = PipeFactoryRegistry.INSTANCE;
private final List<HeadStage> consumerStages = new LinkedList<HeadStage>(); private final List<HeadStage> consumerStages = new LinkedList<HeadStage>();
private final List<HeadStage> finiteProducerStages = new LinkedList<HeadStage>(); private final List<HeadStage> finiteProducerStages = new LinkedList<HeadStage>();
private final List<HeadStage> infiniteProducerStages = new LinkedList<HeadStage>(); private final List<HeadStage> infiniteProducerStages = new LinkedList<HeadStage>();
......
src/performancetest/java/teetime/examples/loopStage/LoopStageAnalysisConfiguration.java
+ 1
− 6
View file @ 46d75a15
...@@ -2,20 +2,15 @@ package teetime.examples.loopStage; ...@@ -2,20 +2,15 @@ package teetime.examples.loopStage;
import teetime.framework.AnalysisConfiguration; import teetime.framework.AnalysisConfiguration;
import teetime.framework.pipe.IPipeFactory; import teetime.framework.pipe.IPipeFactory;
import teetime.framework.pipe.PipeFactoryRegistry;
import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering; import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication; import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
import teetime.examples.loopStage.Countdown;
public class LoopStageAnalysisConfiguration extends AnalysisConfiguration { public class LoopStageAnalysisConfiguration extends AnalysisConfiguration {
private final PipeFactoryRegistry pipeFactory = PipeFactoryRegistry.INSTANCE;
public LoopStageAnalysisConfiguration() { public LoopStageAnalysisConfiguration() {
Countdown countdown = new Countdown(10); Countdown countdown = new Countdown(10);
IPipeFactory factory = this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.QUEUE_BASED, true); IPipeFactory factory = PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.QUEUE_BASED, true);
factory.create(countdown.getNewCountdownOutputPort(), countdown.getCountdownInputPort()); factory.create(countdown.getNewCountdownOutputPort(), countdown.getCountdownInputPort());
this.getFiniteProducerStages().add(countdown); this.getFiniteProducerStages().add(countdown);
......
src/performancetest/java/teetime/examples/recordReader/RecordReaderConfiguration.java
+ 2
− 4
View file @ 46d75a15
...@@ -21,7 +21,6 @@ import java.util.List; ...@@ -21,7 +21,6 @@ import java.util.List;
import teetime.framework.AnalysisConfiguration; import teetime.framework.AnalysisConfiguration;
import teetime.framework.HeadStage; import teetime.framework.HeadStage;
import teetime.framework.pipe.PipeFactoryRegistry;
import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering; import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication; import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
import teetime.stage.CollectorSink; import teetime.stage.CollectorSink;
...@@ -39,7 +38,6 @@ import kieker.common.record.IMonitoringRecord; ...@@ -39,7 +38,6 @@ import kieker.common.record.IMonitoringRecord;
public class RecordReaderConfiguration extends AnalysisConfiguration { public class RecordReaderConfiguration extends AnalysisConfiguration {
private final List<IMonitoringRecord> elementCollection = new LinkedList<IMonitoringRecord>(); private final List<IMonitoringRecord> elementCollection = new LinkedList<IMonitoringRecord>();
private final PipeFactoryRegistry pipeFactory = PipeFactoryRegistry.INSTANCE;
public RecordReaderConfiguration() { public RecordReaderConfiguration() {
this.buildConfiguration(); this.buildConfiguration();
...@@ -59,10 +57,10 @@ public class RecordReaderConfiguration extends AnalysisConfiguration { ...@@ -59,10 +57,10 @@ public class RecordReaderConfiguration extends AnalysisConfiguration {
CollectorSink<IMonitoringRecord> collector = new CollectorSink<IMonitoringRecord>(this.elementCollection); CollectorSink<IMonitoringRecord> collector = new CollectorSink<IMonitoringRecord>(this.elementCollection);
// connect stages // connect stages
this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(initialElementProducer.getOutputPort(), dir2RecordsFilter.getInputPort()); .create(initialElementProducer.getOutputPort(), dir2RecordsFilter.getInputPort());
this.pipeFactory.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(dir2RecordsFilter.getOutputPort(), collector.getInputPort()); .create(dir2RecordsFilter.getOutputPort(), collector.getInputPort());
return initialElementProducer; return initialElementProducer;
......
src/test/java/teetime/examples/cipher/CipherConfiguration.java
+ 6
− 9
View file @ 46d75a15
...@@ -3,7 +3,6 @@ package teetime.examples.cipher; ...@@ -3,7 +3,6 @@ package teetime.examples.cipher;
import java.io.File; import java.io.File;
import teetime.framework.AnalysisConfiguration; import teetime.framework.AnalysisConfiguration;
import teetime.framework.pipe.PipeFactoryRegistry;
import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering; import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication; import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
import teetime.stage.CipherByteArray; import teetime.stage.CipherByteArray;
...@@ -16,8 +15,6 @@ import teetime.stage.io.File2ByteArray; ...@@ -16,8 +15,6 @@ import teetime.stage.io.File2ByteArray;
public class CipherConfiguration extends AnalysisConfiguration { public class CipherConfiguration extends AnalysisConfiguration {
private static final PipeFactoryRegistry pipeFactoryRegistry = PipeFactoryRegistry.INSTANCE;
private final File input, output; private final File input, output;
private final String password; private final String password;
...@@ -34,17 +31,17 @@ public class CipherConfiguration extends AnalysisConfiguration { ...@@ -34,17 +31,17 @@ public class CipherConfiguration extends AnalysisConfiguration {
CipherByteArray decrypt = new CipherByteArray(this.password, CipherMode.DECRYPT); CipherByteArray decrypt = new CipherByteArray(this.password, CipherMode.DECRYPT);
ByteArrayFileWriter writer = new ByteArrayFileWriter(output); ByteArrayFileWriter writer = new ByteArrayFileWriter(output);
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(init.getOutputPort(), f2b.getInputPort()); .create(init.getOutputPort(), f2b.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(f2b.getOutputPort(), enc.getInputPort()); .create(f2b.getOutputPort(), enc.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(enc.getOutputPort(), comp.getInputPort()); .create(enc.getOutputPort(), comp.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(comp.getOutputPort(), decomp.getInputPort()); .create(comp.getOutputPort(), decomp.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(decomp.getOutputPort(), decrypt.getInputPort()); .create(decomp.getOutputPort(), decrypt.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false) PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false)
.create(decrypt.getOutputPort(), writer.getInputPort()); .create(decrypt.getOutputPort(), writer.getInputPort());
this.getFiniteProducerStages().add(init); this.getFiniteProducerStages().add(init);
......
src/test/java/teetime/examples/tokenizer/TokenizerConfiguration.java
+ 6
− 8
View file @ 46d75a15
...@@ -3,7 +3,6 @@ package teetime.examples.tokenizer; ...@@ -3,7 +3,6 @@ package teetime.examples.tokenizer;
import java.io.File; import java.io.File;
import teetime.framework.AnalysisConfiguration; import teetime.framework.AnalysisConfiguration;
import teetime.framework.pipe.PipeFactoryRegistry;
import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering; import teetime.framework.pipe.PipeFactoryRegistry.PipeOrdering;
import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication; import teetime.framework.pipe.PipeFactoryRegistry.ThreadCommunication;
import teetime.stage.ByteArray2String; import teetime.stage.ByteArray2String;
...@@ -18,7 +17,6 @@ import teetime.stage.io.File2ByteArray; ...@@ -18,7 +17,6 @@ import teetime.stage.io.File2ByteArray;
public class TokenizerConfiguration extends AnalysisConfiguration { public class TokenizerConfiguration extends AnalysisConfiguration {
private static final PipeFactoryRegistry pipeFactoryRegistry = PipeFactoryRegistry.INSTANCE;
private final File input; private final File input;
private final String password; private final String password;
private final Counter<String> counter; private final Counter<String> counter;
...@@ -35,17 +33,17 @@ public class TokenizerConfiguration extends AnalysisConfiguration { ...@@ -35,17 +33,17 @@ public class TokenizerConfiguration extends AnalysisConfiguration {
Tokenizer tokenizer = new Tokenizer(" "); Tokenizer tokenizer = new Tokenizer(" ");
counter = new Counter<String>(); counter = new Counter<String>();
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create( PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create(
init.getOutputPort(), f2b.getInputPort()); init.getOutputPort(), f2b.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create( PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create(
f2b.getOutputPort(), decomp.getInputPort()); f2b.getOutputPort(), decomp.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create( PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create(
decomp.getOutputPort(), decrypt.getInputPort()); decomp.getOutputPort(), decrypt.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create( PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create(
decrypt.getOutputPort(), b2s.getInputPort()); decrypt.getOutputPort(), b2s.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create( PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create(
b2s.getOutputPort(), tokenizer.getInputPort()); b2s.getOutputPort(), tokenizer.getInputPort());
pipeFactoryRegistry.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create( PIPE_FACTORY_REGISTRY.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false).create(
tokenizer.getOutputPort(), counter.getInputPort()); tokenizer.getOutputPort(), counter.getInputPort());
this.getFiniteProducerStages().add(init); this.getFiniteProducerStages().add(init);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment