diff --git a/src/main/java/experiment/Experiment2.java b/src/main/java/experiment/Experiment2.java index c81470364d7c661e4160ffe48603e3f92b975732..9b8a7962f714e64ae3ebfab1f424dcded2cad4d3 100644 --- a/src/main/java/experiment/Experiment2.java +++ b/src/main/java/experiment/Experiment2.java @@ -19,6 +19,7 @@ import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -133,6 +134,9 @@ public class Experiment2 { private WorkerThread workerThread; private final boolean shouldUseQueue; + // FIXME instantiate me + private Collection<TimestampObject> timestampObjects; + public TeeTimeAnalysis(final boolean shouldUseQueue) { this.shouldUseQueue = shouldUseQueue; } @@ -216,6 +220,9 @@ public class Experiment2 { private IAnalysisController ac; + // FIXME instantiate me + private Collection<TimestampObject> timestampObjects; + public KiekerAnalysis() {} @Override diff --git a/src/main/java/teetime/examples/traceReconstruction/TraceReconstructionAnalysis2.java b/src/main/java/teetime/examples/traceReconstruction/TraceReconstructionAnalysis2.java index 2db4c764c7be0bc717c9e4ad82fd3fa7d65783a5..3ea7e0a03762f5785cf1bc18bcefb9a3d66bd0f9 100644 --- a/src/main/java/teetime/examples/traceReconstruction/TraceReconstructionAnalysis2.java +++ b/src/main/java/teetime/examples/traceReconstruction/TraceReconstructionAnalysis2.java @@ -46,7 +46,7 @@ import teetime.stage.util.TextLine; /** * @author Christian Wulf - * + * * @since 1.10 */ public class TraceReconstructionAnalysis2 extends Analysis { @@ -111,11 +111,11 @@ public class TraceReconstructionAnalysis2 extends Analysis { QueuePipe.connect(cache.objectOutputPort, textLine2RecordFilter.textLineInputPort); QueuePipe.connect(textLine2RecordFilter.recordOutputPort, stringBufferFilter.objectInputPort); QueuePipe.connect(stringBufferFilter.objectOutputPort, timestampFilter.inputPort); - QueuePipe.connect(timestampFilter.matchingOutputPort, traceIdFilter.inputPort); +// QueuePipe.connect(timestampFilter.matchingOutputPort, traceIdFilter.inputPort); // QueuePipe.connect(timestampFilter.mismatchingOutputPort, YYY); // ignore this case QueuePipe.connect(traceIdFilter.matchingOutputPort, instanceOfFilter.inputPort); // QueuePipe.connect(traceIdFilter.mismatchingOutputPort, traceIdFilter.inputPort); // ignore this case - QueuePipe.connect(XXX, traceReconstructionFilter.timestampInputPort); +// QueuePipe.connect(XXX, traceReconstructionFilter.timestampInputPort); QueuePipe.connect(instanceOfFilter.matchingOutputPort, traceReconstructionFilter.recordInputPort); // QueuePipe.connect(instanceOfFilter.mismatchingOutputPort, instanceOfFilter.inputPort); // ignore this case QueuePipe.connect(traceReconstructionFilter.traceValidOutputPort, countingFilter.INPUT_OBJECT); diff --git a/src/main/java/teetime/stage/CollectorSink.java b/src/main/java/teetime/stage/CollectorSink.java index 82124438875e157e14f4955485d763d07cc3cf90..ccefdc7bd34acd3820ec1029d837787e5146c426 100644 --- a/src/main/java/teetime/stage/CollectorSink.java +++ b/src/main/java/teetime/stage/CollectorSink.java @@ -16,7 +16,6 @@ package teetime.stage; import java.util.Collection; -import java.util.concurrent.TimeUnit; import teetime.framework.core.AbstractFilter; import teetime.framework.core.Context; @@ -53,9 +52,9 @@ public class CollectorSink<T> extends AbstractFilter<CollectorSink<T>> { this.objects.add(object); if ((this.objects.size() % THRESHOLD) == 0) { System.out.println("size: " + this.objects.size()); - stopWatch.end(); - System.out.println("duration: "+TimeUnit.NANOSECONDS.toMillis(stopWatch.getDurationInNs())+" ms"); - stopWatch.start(); +// stopWatch.end(); +// System.out.println("duration: "+TimeUnit.NANOSECONDS.toMillis(stopWatch.getDurationInNs())+" ms"); +// stopWatch.start(); } return true;