Skip to content
Snippets Groups Projects
Commit 92318842 authored by Florian Fittkau's avatar Florian Fittkau
Browse files

refactoring

parent 98abb6bc
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 40 additions and 39 deletions
src/explorviz/hpc_monitoring/filter/reconstruction/TraceBuffer.java
+ 4
− 4
View file @ 92318842
...@@ -7,10 +7,10 @@ import java.util.TreeSet; ...@@ -7,10 +7,10 @@ import java.util.TreeSet;
import explorviz.hpc_monitoring.record.HostApplicationMetadata; import explorviz.hpc_monitoring.record.HostApplicationMetadata;
import explorviz.hpc_monitoring.record.Trace; import explorviz.hpc_monitoring.record.Trace;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent; import explorviz.hpc_monitoring.record.event.AbstractOperationEvent;
import explorviz.hpc_monitoring.record.events.normal.AfterFailedOperationEvent; import explorviz.hpc_monitoring.record.event.normal.AfterFailedOperationEvent;
import explorviz.hpc_monitoring.record.events.normal.AfterOperationEvent; import explorviz.hpc_monitoring.record.event.normal.AfterOperationEvent;
import explorviz.hpc_monitoring.record.events.normal.BeforeOperationEvent; import explorviz.hpc_monitoring.record.event.normal.BeforeOperationEvent;
public class TraceBuffer { public class TraceBuffer {
private static final Comparator<AbstractOperationEvent> COMPARATOR = new AbstractOperationEventComperator(); private static final Comparator<AbstractOperationEvent> COMPARATOR = new AbstractOperationEventComperator();
......
src/explorviz/hpc_monitoring/filter/reconstruction/TraceReconstructionFilter.java
+ 12
− 12
View file @ 92318842
package explorviz.hpc_monitoring.filter.reconstruction; package explorviz.hpc_monitoring.filter.reconstruction;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
...@@ -14,11 +15,11 @@ import explorviz.hpc_monitoring.disruptor.RecordEvent; ...@@ -14,11 +15,11 @@ import explorviz.hpc_monitoring.disruptor.RecordEvent;
import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter; import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter;
import explorviz.hpc_monitoring.filter.reduction.TracePatternSummarizationFilter; import explorviz.hpc_monitoring.filter.reduction.TracePatternSummarizationFilter;
import explorviz.hpc_monitoring.reader.IPeriodicTimeSignalReceiver; import explorviz.hpc_monitoring.reader.IPeriodicTimeSignalReceiver;
import explorviz.hpc_monitoring.reader.TimeReader; import explorviz.hpc_monitoring.reader.TimedReader;
import explorviz.hpc_monitoring.record.HostApplicationMetadata; import explorviz.hpc_monitoring.record.HostApplicationMetadata;
import explorviz.hpc_monitoring.record.IRecord; import explorviz.hpc_monitoring.record.IRecord;
import explorviz.hpc_monitoring.record.Trace; import explorviz.hpc_monitoring.record.Trace;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent; import explorviz.hpc_monitoring.record.event.AbstractOperationEvent;
public final class TraceReconstructionFilter implements public final class TraceReconstructionFilter implements
EventHandler<RecordArrayEvent>, IPeriodicTimeSignalReceiver { EventHandler<RecordArrayEvent>, IPeriodicTimeSignalReceiver {
...@@ -50,7 +51,7 @@ public final class TraceReconstructionFilter implements ...@@ -50,7 +51,7 @@ public final class TraceReconstructionFilter implements
disruptor.handleEventsWith(eventHandlers); disruptor.handleEventsWith(eventHandlers);
ringBuffer = disruptor.start(); ringBuffer = disruptor.start();
new TimeReader(1 * 1000, this).start(); new TimedReader(1 * 1000, this).start();
} }
@Override @Override
...@@ -61,15 +62,14 @@ public final class TraceReconstructionFilter implements ...@@ -61,15 +62,14 @@ public final class TraceReconstructionFilter implements
} }
private void checkForTimeouts(final long timestamp) { private void checkForTimeouts(final long timestamp) {
// final long traceTimeout = timestamp - maxTraceTimeout; final long traceTimeout = timestamp - maxTraceTimeout;
// for (final TLongObjectIterator<TraceBuffer> iterator = traceId2trace for (final Entry<Long, TraceBuffer> entry : traceId2trace.entrySet()) {
// .iterator(); iterator.hasNext(); iterator.advance()) { final TraceBuffer traceBuffer = entry.getValue();
// final TraceBuffer traceBuffer = iterator.value(); if (traceBuffer.getMaxLoggingTimestamp() <= traceTimeout) {
// if (traceBuffer.getMaxLoggingTimestamp() <= traceTimeout) { sendOutInvalidTrace(traceBuffer.toTrace());
// sendOutInvalidTrace(traceBuffer.toTrace()); // TODO remove from traceId2trace
// iterator.remove(); }
// } }
// }
} }
private void sendOutValidTrace(final Trace trace) { private void sendOutValidTrace(final Trace trace) {
......
src/explorviz/hpc_monitoring/filter/reduction/TraceAggregationBuffer.java
+ 1
− 1
View file @ 92318842
package explorviz.hpc_monitoring.filter.reduction; package explorviz.hpc_monitoring.filter.reduction;
import explorviz.hpc_monitoring.record.Trace; import explorviz.hpc_monitoring.record.Trace;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent; import explorviz.hpc_monitoring.record.event.AbstractOperationEvent;
public class TraceAggregationBuffer { public class TraceAggregationBuffer {
private Trace accumulator; private Trace accumulator;
......
src/explorviz/hpc_monitoring/filter/reduction/TracePatternSummarizationFilter.java
+ 3
− 3
View file @ 92318842
...@@ -16,10 +16,10 @@ import explorviz.hpc_monitoring.disruptor.RecordArrayEvent; ...@@ -16,10 +16,10 @@ import explorviz.hpc_monitoring.disruptor.RecordArrayEvent;
import explorviz.hpc_monitoring.disruptor.RecordEvent; import explorviz.hpc_monitoring.disruptor.RecordEvent;
import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter; import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter;
import explorviz.hpc_monitoring.reader.IPeriodicTimeSignalReceiver; import explorviz.hpc_monitoring.reader.IPeriodicTimeSignalReceiver;
import explorviz.hpc_monitoring.reader.TimeReader; import explorviz.hpc_monitoring.reader.TimedReader;
import explorviz.hpc_monitoring.record.IRecord; import explorviz.hpc_monitoring.record.IRecord;
import explorviz.hpc_monitoring.record.Trace; import explorviz.hpc_monitoring.record.Trace;
import explorviz.hpc_monitoring.record.events.AbstractOperationEvent; import explorviz.hpc_monitoring.record.event.AbstractOperationEvent;
public class TracePatternSummarizationFilter implements public class TracePatternSummarizationFilter implements
EventHandler<RecordArrayEvent>, IPeriodicTimeSignalReceiver { EventHandler<RecordArrayEvent>, IPeriodicTimeSignalReceiver {
...@@ -48,7 +48,7 @@ public class TracePatternSummarizationFilter implements ...@@ -48,7 +48,7 @@ public class TracePatternSummarizationFilter implements
disruptor.handleEventsWith(eventHandlers); disruptor.handleEventsWith(eventHandlers);
} }
ringBuffer = disruptor.start(); ringBuffer = disruptor.start();
new TimeReader(1 * 1000, this).start(); new TimedReader(1 * 1000, this).start();
} }
@Override @Override
......
src/explorviz/hpc_monitoring/reader/TCPReader.java
+ 20
− 19
View file @ 92318842
...@@ -23,9 +23,9 @@ import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter; ...@@ -23,9 +23,9 @@ import explorviz.hpc_monitoring.filter.counting.CountingThroughputFilter;
import explorviz.hpc_monitoring.filter.reconstruction.TraceReconstructionFilter; import explorviz.hpc_monitoring.filter.reconstruction.TraceReconstructionFilter;
import explorviz.hpc_monitoring.record.HostApplicationMetadata; import explorviz.hpc_monitoring.record.HostApplicationMetadata;
import explorviz.hpc_monitoring.record.IRecord; import explorviz.hpc_monitoring.record.IRecord;
import explorviz.hpc_monitoring.record.events.normal.AfterFailedOperationEvent; import explorviz.hpc_monitoring.record.event.normal.AfterFailedOperationEvent;
import explorviz.hpc_monitoring.record.events.normal.AfterOperationEvent; import explorviz.hpc_monitoring.record.event.normal.AfterOperationEvent;
import explorviz.hpc_monitoring.record.events.normal.BeforeOperationEvent; import explorviz.hpc_monitoring.record.event.normal.BeforeOperationEvent;
public final class TCPReader implements IPeriodicTimeSignalReceiver { public final class TCPReader implements IPeriodicTimeSignalReceiver {
private static final int MESSAGE_BUFFER_SIZE = 131072; private static final int MESSAGE_BUFFER_SIZE = 131072;
...@@ -65,13 +65,15 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver { ...@@ -65,13 +65,15 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver {
disruptor.handleEventsWith(eventHandlers); disruptor.handleEventsWith(eventHandlers);
ringBuffer = disruptor.start(); ringBuffer = disruptor.start();
new TimeReader(1 * 1000, this).start(); new TimedReader(1 * 1000, this).start();
} }
@Override @Override
public void periodicTimeSignal(final long timestamp) { public void periodicTimeSignal(final long timestamp) {
synchronized (this) { // TODO remove
flushOutputBuffer(); flushOutputBuffer();
} }
}
public final void read() { public final void read() {
try { try {
...@@ -252,7 +254,6 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver { ...@@ -252,7 +254,6 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver {
} }
private void flushOutputBuffer() { private void flushOutputBuffer() {
synchronized (this) { // TODO remove
if (outputBufferIndex > 0) { if (outputBufferIndex > 0) {
final long hiseq = ringBuffer.next(); final long hiseq = ringBuffer.next();
final RecordArrayEvent valueEvent = ringBuffer.get(hiseq); final RecordArrayEvent valueEvent = ringBuffer.get(hiseq);
...@@ -266,10 +267,10 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver { ...@@ -266,10 +267,10 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver {
outputBufferIndex = 0; outputBufferIndex = 0;
} }
} }
}
private final void putInWaitingMessages(final byte[] message) { private final void putInWaitingMessages(final byte[] message) {
waitingForStringMessages.add(message); waitingForStringMessages.add(message); // TODO kill messages if too long
// in queue
} }
private final void checkWaitingMessages() { private final void checkWaitingMessages() {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment