diff --git a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java index a82d32bf7d4f6f9f31f120e0f80c4dfb1099fd75..f2e5f9338d8606e66d99221e15e3ff0265a162bb 100644 --- a/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java +++ b/src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java @@ -10,6 +10,7 @@ import explorviz.live_trace_processing.record.event.AbstractAfterEventRecord; import explorviz.live_trace_processing.record.event.AbstractAfterFailedEventRecord; import explorviz.live_trace_processing.record.event.AbstractBeforeEventRecord; import explorviz.live_trace_processing.record.event.AbstractEventRecord; +import explorviz.live_trace_processing.record.trace.RuntimeStatisticInformation; import explorviz.live_trace_processing.record.trace.Trace; class TraceReconstructionBuffer { @@ -85,7 +86,8 @@ class TraceReconstructionBuffer { final AbstractBeforeEventRecord beforeEvent = stack.pop(); final long time = event.getLoggingTimestamp() - beforeEvent.getLoggingTimestamp(); - beforeEvent.getRuntime().set(time); + beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(1, time, + time * time)); } } return new Trace(events, valid); diff --git a/src/explorviz/live_trace_processing/filter/reduction/summarization/TracePatternSummarizationBuffer.java b/src/explorviz/live_trace_processing/filter/reduction/summarization/TracePatternSummarizationBuffer.java index d6d7635d52cfd8c2d590d2df8fd10beebc29d6ce..6a665c1ceb8ddb24903b888e6353180b4d51281a 100644 --- a/src/explorviz/live_trace_processing/filter/reduction/summarization/TracePatternSummarizationBuffer.java +++ b/src/explorviz/live_trace_processing/filter/reduction/summarization/TracePatternSummarizationBuffer.java @@ -35,8 +35,8 @@ class TracePatternSummarizationBuffer { final AbstractBeforeEventRecord abstractBeforeEventRecord = (AbstractBeforeEventRecord) event; final AbstractBeforeEventRecord abstractBeforeEventRecord2 = (AbstractBeforeEventRecord) records .get(i); - abstractBeforeEventRecord.getRuntime().merge( - abstractBeforeEventRecord2.getRuntime()); + abstractBeforeEventRecord.getRuntimeStatisticInformation().merge( + abstractBeforeEventRecord2.getRuntimeStatisticInformation()); } } } diff --git a/src/explorviz/live_trace_processing/main/FilterConfiguration.java b/src/explorviz/live_trace_processing/main/FilterConfiguration.java index 4975c418d1ed8d7a49c50d6e1ecba67ea6c73322..8590ac5e43679dbf9d4fe89279dd0f1689afbec0 100644 --- a/src/explorviz/live_trace_processing/main/FilterConfiguration.java +++ b/src/explorviz/live_trace_processing/main/FilterConfiguration.java @@ -15,7 +15,7 @@ public class FilterConfiguration { public static void configureAndStartFilters(final Configuration configuration, final ITraceSink sink) { final ITraceReduction traceReduction = new TracePatternSummarizationFilter( - TimeUnit.SECONDS.toNanos(1), sink); + TimeUnit.MILLISECONDS.toNanos(990), sink); final ITraceReconstruction traceReconstruction = new TraceReconstructionFilter( TimeUnit.SECONDS.toNanos(4), traceReduction); diff --git a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java index 022dfebb03958b65160d7fc02c0d72c6984944b6..734ad7da9bc8f758dd63e385dd8492e00539a005 100644 --- a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java +++ b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java @@ -28,7 +28,6 @@ import explorviz.live_trace_processing.record.misc.StringRegistryRecord; import explorviz.live_trace_processing.record.misc.SystemMonitoringRecord; import explorviz.live_trace_processing.record.misc.TimedPeriodRecord; import explorviz.live_trace_processing.record.trace.HostApplicationMetaDataRecord; -import explorviz.live_trace_processing.record.trace.RuntimeStatisticInformation; import explorviz.live_trace_processing.record.trace.Trace; public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalReceiver { @@ -284,7 +283,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final String operation = stringRegistry.getStringFromId(operationId); putInRingBuffer(new BeforeOperationEventRecord(timestamp, traceId, orderIndex, - objectId, operation, hostApplicationMetadata, new RuntimeStatisticInformation())); + objectId, operation, hostApplicationMetadata)); } catch (final IdNotAvailableException e) { putInWaitingMessages(buffer, BeforeOperationEventRecord.COMPRESSED_BYTE_LENGTH + 1); } @@ -335,7 +334,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final String operation = stringRegistry.getStringFromId(operationId); putInRingBuffer(new BeforeConstructorEventRecord(timestamp, traceId, orderIndex, - objectId, operation, hostApplicationMetadata, new RuntimeStatisticInformation())); + objectId, operation, hostApplicationMetadata)); } catch (final IdNotAvailableException e) { putInWaitingMessages(buffer, BeforeConstructorEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); @@ -378,7 +377,7 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final String operation = stringRegistry.getStringFromId(operationId); putInRingBuffer(new BeforeStaticOperationEventRecord(timestamp, traceId, orderIndex, - operation, hostApplicationMetadata, new RuntimeStatisticInformation())); + operation, hostApplicationMetadata)); } catch (final IdNotAvailableException e) { putInWaitingMessages(buffer, BeforeStaticOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); diff --git a/test/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBufferTest.java b/test/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBufferTest.java index 9f5ec67ecf14f6c41daecf64bc2cc80127098ab7..66d202973b06cfc87b334e046251e45f5f7e5e28 100644 --- a/test/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBufferTest.java +++ b/test/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBufferTest.java @@ -6,7 +6,6 @@ import org.junit.Test; import explorviz.live_trace_processing.record.event.normal.BeforeOperationEventRecord; import explorviz.live_trace_processing.record.trace.HostApplicationMetaDataRecord; -import explorviz.live_trace_processing.record.trace.RuntimeStatisticInformation; public class TraceReconstructionBufferTest { @@ -14,8 +13,7 @@ public class TraceReconstructionBufferTest { public void testInsertEvent() throws Exception { final TraceReconstructionBuffer traceReconstructionBuffer = new TraceReconstructionBuffer(); traceReconstructionBuffer.insertEvent(new BeforeOperationEventRecord(1000, 1, 0, 0, "test", - new HostApplicationMetaDataRecord("testHost", "testApp"), - new RuntimeStatisticInformation())); + new HostApplicationMetaDataRecord("testHost", "testApp"))); assertTrue(true); // TODO }