From 351b6cbe7d84a5235496be6a1b976d020ab24af5 Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Mon, 16 Jun 2014 17:07:01 +0200
Subject: [PATCH] invalid traces also do objectId
---
.../reconstruction/TraceReconstructionBuffer.java | 1 +
.../filter/reduction/TracesSummarizationBuffer.java | 11 +----------
.../filter/reduction/TracesSummarizationFilter.java | 12 ++++++++++++
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java
index ea56269..502fd82 100644
--- a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java
+++ b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java
@@ -32,6 +32,7 @@ class TraceReconstructionBuffer {
openEvents++;
final AbstractBeforeEventRecord beforeEvent = (AbstractBeforeEventRecord) event;
beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(1, -1, -1)); // TODO
+
// if
// invalid,
// trace
diff --git a/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationBuffer.java b/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationBuffer.java
index d000ac9..18ee675 100644
--- a/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationBuffer.java
+++ b/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationBuffer.java
@@ -25,16 +25,6 @@ class TracesSummarizationBuffer {
public void insertTrace(final Trace trace) {
if (accumulator == null) {
accumulator = trace;
-
- for (int i = 0; i < trace.getTraceEvents().size(); i++) {
- final AbstractEventRecord event = trace.getTraceEvents().get(i);
- if (event instanceof AbstractBeforeEventRecord) {
- final AbstractBeforeEventRecord abstractBeforeEventRecord = (AbstractBeforeEventRecord) event;
- abstractBeforeEventRecord.getRuntimeStatisticInformation().makeAccumulator(
- abstractBeforeEventRecord.getObjectId());
- }
- }
-
} else {
final List<AbstractEventRecord> aggregatedRecords = accumulator.getTraceEvents();
final List<AbstractEventRecord> records = trace.getTraceEvents();
@@ -45,6 +35,7 @@ class TracesSummarizationBuffer {
final AbstractBeforeEventRecord abstractBeforeEventRecord = (AbstractBeforeEventRecord) event;
final AbstractBeforeEventRecord abstractBeforeEventRecord2 = (AbstractBeforeEventRecord) records
.get(i);
+
abstractBeforeEventRecord.getRuntimeStatisticInformation().merge(
abstractBeforeEventRecord2.getRuntimeStatisticInformation(),
abstractBeforeEventRecord2.getObjectId());
diff --git a/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationFilter.java b/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationFilter.java
index 7e9124f..95893c5 100644
--- a/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationFilter.java
+++ b/src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationFilter.java
@@ -10,6 +10,8 @@ import explorviz.live_trace_processing.filter.AbstractFilter;
import explorviz.live_trace_processing.filter.IPipeReceiver;
import explorviz.live_trace_processing.reader.TimeProvider;
import explorviz.live_trace_processing.record.IRecord;
+import explorviz.live_trace_processing.record.event.AbstractBeforeEventRecord;
+import explorviz.live_trace_processing.record.event.AbstractEventRecord;
import explorviz.live_trace_processing.record.misc.TerminateRecord;
import explorviz.live_trace_processing.record.misc.TimedPeriodRecord;
import explorviz.live_trace_processing.record.trace.Trace;
@@ -35,6 +37,16 @@ public class TracesSummarizationFilter extends AbstractFilter implements ITraceR
public void processRecord(final IRecord record) {
if (record instanceof Trace) {
final Trace trace = (Trace) record;
+
+ for (int i = 0; i < trace.getTraceEvents().size(); i++) {
+ final AbstractEventRecord event = trace.getTraceEvents().get(i);
+ if (event instanceof AbstractBeforeEventRecord) {
+ final AbstractBeforeEventRecord abstractBeforeEventRecord = (AbstractBeforeEventRecord) event;
+ abstractBeforeEventRecord.getRuntimeStatisticInformation().makeAccumulator(
+ abstractBeforeEventRecord.getObjectId());
+ }
+ }
+
if (trace.isValid()) {
insertIntoBuffer(trace);
} else {
--
GitLab