From e76800721c2a842c6581dddeb8677350adecd99f Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Fri, 28 Mar 2014 22:42:52 +0100
Subject: [PATCH] merge with pst-bachelor branch
---
.../filter/reconstruction/TraceReconstructionFilter.java | 3 +--
.../live_trace_processing/main/FilterConfiguration.java | 7 +++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionFilter.java b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionFilter.java
index e8c51f2..d085972 100644
--- a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionFilter.java
+++ b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionFilter.java
@@ -39,8 +39,7 @@ public final class TraceReconstructionFilter extends AbstractFilter implements I
traceBuffer.insertEvent(abstractOperationEvent);
if (traceBuffer.isFinished()) {
- final Trace trace = traceBuffer.toTrace(true);
- deliver(trace);
+ deliver(traceBuffer.toTrace(true));
traceId2trace.remove(traceId);
}
} else if (record instanceof Trace) {
diff --git a/src/explorviz/live_trace_processing/main/FilterConfiguration.java b/src/explorviz/live_trace_processing/main/FilterConfiguration.java
index cbce1f6..d931289 100644
--- a/src/explorviz/live_trace_processing/main/FilterConfiguration.java
+++ b/src/explorviz/live_trace_processing/main/FilterConfiguration.java
@@ -5,8 +5,6 @@ import java.util.concurrent.TimeUnit;
import explorviz.live_trace_processing.configuration.Configuration;
import explorviz.live_trace_processing.configuration.ConfigurationFactory;
import explorviz.live_trace_processing.filter.ITraceSink;
-import explorviz.live_trace_processing.filter.counting.IRecordCounting;
-import explorviz.live_trace_processing.filter.counting.RecordCountingFilter;
import explorviz.live_trace_processing.filter.reconstruction.ITraceReconstruction;
import explorviz.live_trace_processing.filter.reconstruction.TraceReconstructionFilter;
import explorviz.live_trace_processing.filter.reduction.ITraceReduction;
@@ -16,10 +14,11 @@ import explorviz.live_trace_processing.reader.TCPReader;
public class FilterConfiguration {
public static void configureAndStartFilters(final Configuration configuration,
final ITraceSink sink) {
- final IRecordCounting recordCounting = new RecordCountingFilter(sink);
+ // final IRecordCounting recordCounting = new
+ // RecordCountingFilter(sink);
final ITraceReduction traceReduction = new TracePatternSummarizationFilter(
- TimeUnit.MILLISECONDS.toNanos(990), recordCounting);
+ TimeUnit.MILLISECONDS.toNanos(990), sink);
final ITraceReconstruction traceReconstruction = new TraceReconstructionFilter(
TimeUnit.SECONDS.toNanos(4), traceReduction);
--
GitLab