From 96b57e0a6165037a848e81b7e14e345e339fc113 Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Thu, 12 Feb 2015 17:53:39 +0100
Subject: [PATCH] minor
---
.../main/FilterConfiguration.java | 9 +----
.../reader/TCPReader.java | 8 ++---
.../reader/TCPReaderOneClient.java | 34 +++++++++----------
3 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/src/explorviz/live_trace_processing/main/FilterConfiguration.java b/src/explorviz/live_trace_processing/main/FilterConfiguration.java
index a0430e4..61b94e2 100644
--- a/src/explorviz/live_trace_processing/main/FilterConfiguration.java
+++ b/src/explorviz/live_trace_processing/main/FilterConfiguration.java
@@ -14,23 +14,16 @@ import explorviz.live_trace_processing.reader.TCPReader;
public class FilterConfiguration {
public static void configureAndStartFilters(final Configuration configuration,
final ITraceSink sink) {
- final boolean isWorker = configuration
- .getBooleanProperty(ConfigurationFactory.WORKER_ENABLED);
-
// final IRecordCounting recordCounting = new
// RecordCountingFilter(sink);
final ITraceReduction traceReduction = new TracesSummarizationFilter(
TimeUnit.MILLISECONDS.toNanos(990), sink);
- // final PatternSummarizationFilter oneTraceReduction = new
- // PatternSummarizationFilter(
- // traceReduction, 300, 1);
-
final ITraceReconstruction traceReconstruction = new TraceReconstructionFilter(
TimeUnit.SECONDS.toNanos(4), traceReduction);
new TCPReader(configuration.getIntProperty(ConfigurationFactory.READER_LISTENING_PORT,
- 10133), isWorker, traceReconstruction).read();
+ 10133), traceReconstruction).read();
}
}
diff --git a/src/explorviz/live_trace_processing/reader/TCPReader.java b/src/explorviz/live_trace_processing/reader/TCPReader.java
index 926fe00..11263c3 100644
--- a/src/explorviz/live_trace_processing/reader/TCPReader.java
+++ b/src/explorviz/live_trace_processing/reader/TCPReader.java
@@ -35,12 +35,8 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver {
private final List<TCPReaderOneClient> threads = new ArrayList<TCPReaderOneClient>();
- private final boolean isWorker;
-
- public TCPReader(final int listeningPort, final boolean isWorker,
- final ITraceReconstruction traceReconstruction) {
+ public TCPReader(final int listeningPort, final ITraceReconstruction traceReconstruction) {
this.listeningPort = listeningPort;
- this.isWorker = isWorker;
final Disruptor<RecordArrayEvent> disruptor = new Disruptor<RecordArrayEvent>(
new RecordArrayEventFactory(Constants.TCP_READER_OUTPUT_BUFFER_SIZE),
@@ -86,7 +82,7 @@ public final class TCPReader implements IPeriodicTimeSignalReceiver {
open();
while (active) {
final TCPReaderOneClient thread = new TCPReaderOneClient(serversocket.accept(),
- isWorker, ringBuffer);
+ ringBuffer);
thread.start();
threads.add(thread);
}
diff --git a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
index b5c34d1..504b2e6 100644
--- a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
+++ b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java
@@ -60,14 +60,11 @@ class TCPReaderOneClient extends Thread {
private String remoteAddress = "";
- private final boolean isWorker;
-
private Trace currentlyOpenTrace;
- public TCPReaderOneClient(final SocketChannel socketChannel, final boolean isWorker,
+ public TCPReaderOneClient(final SocketChannel socketChannel,
final RingBuffer<RecordArrayEvent> ringBuffer) {
this.socketChannel = socketChannel;
- this.isWorker = isWorker;
this.ringBuffer = ringBuffer;
}
@@ -180,24 +177,10 @@ class TCPReaderOneClient extends Thread {
break;
}
case SystemMonitoringRecord.CLAZZ_ID: {
- // if (isWorker) {
if (buffer.remaining() >= SystemMonitoringRecord.COMPRESSED_BYTE_LENGTH) {
readInSystemMonitoringRecord(buffer);
break;
}
- // } else {
- // if (buffer.remaining() >=
- // SystemMonitoringRecord.BYTE_LENGTH) {
- // try {
- // putInRingBuffer(SystemMonitoringRecord.createFromByteBuffer(
- // buffer, stringRegistry));
- // } catch (final IdNotAvailableException e) {
- // // should not happen
- // e.printStackTrace();
- // }
- // break;
- // }
- // }
buffer.position(buffer.position() - 1);
buffer.compact();
return;
@@ -339,6 +322,21 @@ class TCPReaderOneClient extends Thread {
buffer.compact();
return;
}
+ case SystemMonitoringRecord.CLAZZ_ID_FROM_WORKER: {
+ if (buffer.remaining() >= SystemMonitoringRecord.BYTE_LENGTH) {
+ try {
+ putInRingBuffer(SystemMonitoringRecord.createFromByteBuffer(buffer,
+ stringRegistry));
+ } catch (final IdNotAvailableException e) {
+ // should not happen
+ e.printStackTrace();
+ }
+ break;
+ }
+ buffer.position(buffer.position() - 1);
+ buffer.compact();
+ return;
+ }
default: {
System.out.println("unknown class id " + clazzId + " at offset "
+ (buffer.position() - 1));
--
GitLab