WiP

src/META-INF/explorviz.live_trace_processing.default.properties

@@ -9,7 +9,7 @@ explorviz.live_trace_processing.writer_load_balancing_port=9999
 explorviz.live_trace_processing.writer_load_balancing_wait_time=20000
 explorviz.live_trace_processing.writer_load_balancing_scaling_group=analysis-worker
 
-explorviz.live_trace_processing.sending_buffer_size=16777216
+explorviz.live_trace_processing.sending_buffer_size=2097152
 
 ######################## Monitoring ########################
 
@@ -38,7 +38,7 @@ explorviz.live_trace_processing.reader_listening_port=10133
 
 explorviz.live_trace_processing.tcp_reader_disruptor_size=16384
 
-explorviz.live_trace_processing.trace_reconstruction_disruptor_size=4096
+explorviz.live_trace_processing.trace_reconstruction_disruptor_size=256
 explorviz.live_trace_processing.trace_reconstruction_buffer_initial_size=128
 
-explorviz.live_trace_processing.trace_summarization_disruptor_size=256
+explorviz.live_trace_processing.trace_summarization_disruptor_size=64

src/explorviz/live_trace_processing/filter/counting/TraceCountingFilter.java

@@ -5,6 +5,8 @@ import java.util.Queue;
 import explorviz.live_trace_processing.filter.AbstractFilter;
 import explorviz.live_trace_processing.filter.SinglePipeConnector;
 import explorviz.live_trace_processing.record.IRecord;
+import explorviz.live_trace_processing.record.event.AbstractBeforeOperationEventRecord;
+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;
@@ -29,7 +31,14 @@ public class TraceCountingFilter extends AbstractFilter {
 	public void processRecord(final IRecord record) {
 		if (record instanceof Trace) {
 			final Trace trace = (Trace) record;
-			counter.inputObjectsCount(trace.getCalledTimes());
+			if (!trace.getTraceEvents().isEmpty()) {
+				final AbstractEventRecord abstractEventRecord = trace.getTraceEvents().get(0);
+				if (abstractEventRecord instanceof AbstractBeforeOperationEventRecord) {
+					final AbstractBeforeOperationEventRecord abstractBeforeOperationEventRecord = (AbstractBeforeOperationEventRecord) abstractEventRecord;
+					counter.inputObjectsCount(abstractBeforeOperationEventRecord
+							.getRuntimeStatisticInformation().getCount());
+				}
+			}
 			deliver(record);
 		} else if (record instanceof TimedPeriodRecord) {
 			deliver(record);

src/explorviz/live_trace_processing/filter/reconstruction/TraceReconstructionBuffer.java

@@ -33,7 +33,10 @@ class TraceReconstructionBuffer {
 		if ((event instanceof AbstractBeforeEventRecord)) {
 			openEvents++;
 			final AbstractBeforeEventRecord beforeEvent = (AbstractBeforeEventRecord) event;
-			beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(1, -1, -1));
+			if (beforeEvent.getRuntimeStatisticInformation() == null) {
+				beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(1, -1,
+						-1));
+			}
 		} else if ((event instanceof AbstractAfterFailedEventRecord)
 				|| (event instanceof AbstractAfterEventRecord)) {
 			openEvents--;
@@ -91,14 +94,16 @@ class TraceReconstructionBuffer {
 				if (!stack.isEmpty()) {
 					final AbstractBeforeEventRecord beforeEvent = stack.pop();
 
+					if (beforeEvent.getRuntimeStatisticInformation() == null) {
 						final long time = event.getLoggingTimestamp()
 								- beforeEvent.getLoggingTimestamp();
-					beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(1,
-							time, time * time));
+						beforeEvent.setRuntimeStatisticInformation(new RuntimeStatisticInformation(
+								1, time, time * time));
+					}
 				}
 			}
 		}
 		return new Trace(new ArrayList<AbstractEventRecord>(events), valid, containsRemoteRecord,
-				1, events.size());
+				events.size());
 	}
 }

src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationBuffer.java

@@ -27,8 +27,6 @@ class TracesSummarizationBuffer {
 		if (accumulator == null) {
 			accumulator = trace;
 		} else {
-			accumulator.setCalledTimes(accumulator.getCalledTimes() + trace.getCalledTimes());
-
 			final List<AbstractEventRecord> aggregatedRecords = accumulator.getTraceEvents();
 			final List<AbstractEventRecord> records = trace.getTraceEvents();
 

src/explorviz/live_trace_processing/filter/reduction/TracesSummarizationFilter.java

 package explorviz.live_trace_processing.filter.reduction;
 
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Queue;
@@ -80,8 +81,9 @@ public class TracesSummarizationFilter extends AbstractFilter {
 	}
 
 	public void makeTraceElementsAccumulator(final Trace trace) {
-		for (int i = 0; i < trace.getTraceEvents().size(); i++) {
-			final AbstractEventRecord event = trace.getTraceEvents().get(i);
+		final List<AbstractEventRecord> traceEvents = trace.getTraceEvents();
+
+		for (final AbstractEventRecord event : traceEvents) {
 			if (event instanceof AbstractBeforeEventRecord) {
 				final AbstractBeforeEventRecord abstractBeforeEventRecord = (AbstractBeforeEventRecord) event;
 

src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java

@@ -62,7 +62,7 @@ class TCPReaderOneClient extends Thread {
 
 	@Override
 	public void run() {
-		final ByteBuffer buffer = ByteBuffer.allocate(16 * 1024 * 1024);
+		final ByteBuffer buffer = ByteBuffer.allocate(2 * 1024 * 1024);
 		try {
 			String remoteAddress = "";
 			if (socketChannel.isConnected()) {
@@ -194,13 +194,12 @@ class TCPReaderOneClient extends Thread {
 							if (containsRemoteRecordByte == (byte) 0) {
 								containsRemoteRecord = false;
 							}
-							final int calledTimes = buffer.getInt();
 							final int eventsLength = buffer.getInt();
 
 							final List<AbstractEventRecord> events = new ArrayList<AbstractEventRecord>(
 									eventsLength);
 							currentlyOpenTrace = new Trace(events, valid, containsRemoteRecord,
-									calledTimes, eventsLength);
+									eventsLength);
 
 							if (!readInTraceRecordChunks(buffer)) {
 								return;
@@ -406,7 +405,11 @@ class TCPReaderOneClient extends Thread {
 
 					if (currentlyOpenTrace.getTraceEvents().size() == currentlyOpenTrace
 							.getEventsLength()) {
-						putInQueue(currentlyOpenTrace);
+						final List<AbstractEventRecord> traceEvents = currentlyOpenTrace
+								.getTraceEvents();
+						for (final AbstractEventRecord event : traceEvents) {
+							putInQueue(event);
+						}
 						currentlyOpenTrace = null;
 						return !cleared;
 					}