diff --git a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java index 71a6a7d584b519e4fecda457ee751290cc9f7718..022dfebb03958b65160d7fc02c0d72c6984944b6 100644 --- a/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java +++ b/src/explorviz/live_trace_processing/reader/TCPReaderOneClient.java @@ -294,16 +294,13 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final long timestamp = buffer.getLong(); final long traceId = buffer.getLong(); final int orderIndex = buffer.getInt(); - final int objectId = buffer.getInt(); - final int operationId = buffer.getInt(); final int causeId = buffer.getInt(); try { - final String operation = stringRegistry.getStringFromId(operationId); final String cause = stringRegistry.getStringFromId(causeId); putInRingBuffer(new AfterFailedOperationEventRecord(timestamp, traceId, orderIndex, - objectId, operation, cause, hostApplicationMetadata)); + cause, hostApplicationMetadata)); } catch (final IdNotAvailableException e) { putInWaitingMessages(buffer, AfterFailedOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); @@ -314,19 +311,8 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final long timestamp = buffer.getLong(); final long traceId = buffer.getLong(); final int orderIndex = buffer.getInt(); - final int objectId = buffer.getInt(); - final int operationId = buffer.getInt(); - - try { - final String operation = stringRegistry.getStringFromId(operationId); - - putInRingBuffer(new AfterOperationEventRecord(timestamp, traceId, orderIndex, objectId, - operation, hostApplicationMetadata)); - } catch (final IdNotAvailableException e) { - putInWaitingMessages(buffer, - AfterOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); - } - + putInRingBuffer(new AfterOperationEventRecord(timestamp, traceId, orderIndex, + hostApplicationMetadata)); } private final void readInSystemMonitoringRecord(final ByteBuffer buffer) { @@ -360,16 +346,13 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final long timestamp = buffer.getLong(); final long traceId = buffer.getLong(); final int orderIndex = buffer.getInt(); - final int objectId = buffer.getInt(); - final int operationId = buffer.getInt(); final int causeId = buffer.getInt(); try { - final String operation = stringRegistry.getStringFromId(operationId); final String cause = stringRegistry.getStringFromId(causeId); putInRingBuffer(new AfterFailedConstructorEventRecord(timestamp, traceId, orderIndex, - objectId, operation, cause, hostApplicationMetadata)); + cause, hostApplicationMetadata)); } catch (final IdNotAvailableException e) { putInWaitingMessages(buffer, AfterFailedConstructorEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); @@ -380,19 +363,9 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final long timestamp = buffer.getLong(); final long traceId = buffer.getLong(); final int orderIndex = buffer.getInt(); - final int objectId = buffer.getInt(); - final int operationId = buffer.getInt(); - - try { - final String operation = stringRegistry.getStringFromId(operationId); - - putInRingBuffer(new AfterConstructorEventRecord(timestamp, traceId, orderIndex, - objectId, operation, hostApplicationMetadata)); - } catch (final IdNotAvailableException e) { - putInWaitingMessages(buffer, - AfterConstructorEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); - } + putInRingBuffer(new AfterConstructorEventRecord(timestamp, traceId, orderIndex, + hostApplicationMetadata)); } private final void readInBeforeStaticOperationEvent(final ByteBuffer buffer) { @@ -416,15 +389,13 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final long timestamp = buffer.getLong(); final long traceId = buffer.getLong(); final int orderIndex = buffer.getInt(); - final int operationId = buffer.getInt(); final int causeId = buffer.getInt(); try { - final String operation = stringRegistry.getStringFromId(operationId); final String cause = stringRegistry.getStringFromId(causeId); putInRingBuffer(new AfterFailedStaticOperationEventRecord(timestamp, traceId, - orderIndex, operation, cause, hostApplicationMetadata)); + orderIndex, cause, hostApplicationMetadata)); } catch (final IdNotAvailableException e) { putInWaitingMessages(buffer, AfterFailedStaticOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); @@ -435,18 +406,9 @@ public class TCPReaderOneClient extends Thread implements IPeriodicTimeSignalRec final long timestamp = buffer.getLong(); final long traceId = buffer.getLong(); final int orderIndex = buffer.getInt(); - final int operationId = buffer.getInt(); - - try { - final String operation = stringRegistry.getStringFromId(operationId); - - putInRingBuffer(new AfterStaticOperationEventRecord(timestamp, traceId, orderIndex, - operation, hostApplicationMetadata)); - } catch (final IdNotAvailableException e) { - putInWaitingMessages(buffer, - AfterStaticOperationEventRecord.COMPRESSED_BYTE_LENGTH_WITH_CLAZZ_ID); - } + putInRingBuffer(new AfterStaticOperationEventRecord(timestamp, traceId, orderIndex, + hostApplicationMetadata)); } private final void putInWaitingMessages(final ByteBuffer buffer, final int length) {