From aa3b05ef119ff90496bbe34f33de71d8fda1e4ee Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Mon, 18 Jun 2012 12:02:06 -0400 Subject: [PATCH] Restore some code inadvertently commented out --- .../ctf/core/tests/headless/ReadTrace.java | 14 ++- .../ctf/core/trace/StreamInputReader.java | 7 +- .../internal/ctf/core/trace/StreamInput.java | 86 ++++++++++--------- 3 files changed, 59 insertions(+), 48 deletions(-) diff --git a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java index 04fa5270f1..0eb31f4930 100644 --- a/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java +++ b/org.eclipse.linuxtools.ctf.core.tests/src/org/eclipse/linuxtools/ctf/core/tests/headless/ReadTrace.java @@ -15,12 +15,14 @@ package org.eclipse.linuxtools.ctf.core.tests.headless; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Map; import java.util.Vector; import org.eclipse.linuxtools.ctf.core.event.EventDefinition; import org.eclipse.linuxtools.ctf.core.trace.CTFReaderException; import org.eclipse.linuxtools.ctf.core.trace.CTFTrace; import org.eclipse.linuxtools.ctf.core.trace.CTFTraceReader; +import org.eclipse.linuxtools.internal.ctf.core.trace.Stream; @SuppressWarnings("javadoc") public class ReadTrace { @@ -49,7 +51,8 @@ public class ReadTrace { } catch (CTFReaderException e) { // do nothing } -// long prev = -1; + @SuppressWarnings("unused") + long prev = -1; start = System.nanoTime(); if (USE_TEXT) { System.out.println("Event, " + " Time, " + " type, " + " CPU "); @@ -69,11 +72,14 @@ public class ReadTrace { + output + ", " + ed.getDeclaration().getName() + ", " + ed.getCPU() + ed.getFields().toString()) ; } -// long endTime = traceReader.getEndTime(); -// long timestamp = traceReader.getCurrentEventDef().getTimestamp(); + @SuppressWarnings("unused") + long endTime = traceReader.getEndTime(); + @SuppressWarnings("unused") + long timestamp = traceReader.getCurrentEventDef().getTimestamp(); traceReader.advance(); } -// Map streams = traceReader.getTrace().getStreams(); + @SuppressWarnings("unused") + Map streams = traceReader.getTrace().getStreams(); } stop = System.nanoTime(); diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java index c27b657d86..5f71231237 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java @@ -179,8 +179,8 @@ public class StreamInputReader { .getCurrentPacket(); if (prevPacket != null) { goToNextPacket(); -// final StreamInputPacketIndexEntry currentPacket = this.packetReader -// .getCurrentPacket(); + @SuppressWarnings("unused") + final StreamInputPacketIndexEntry currentPacket = this.packetReader.getCurrentPacket(); } } @@ -298,7 +298,8 @@ public class StreamInputReader { */ final int len = this.streamInput.getIndex().getEntries().size(); -// StreamInputPacketIndexEntry entry = null; + @SuppressWarnings("unused") + StreamInputPacketIndexEntry entry = null; /* * Go to beginning of trace. */ diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java index 912ef6fdec..e2d4a76072 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java @@ -13,7 +13,10 @@ package org.eclipse.linuxtools.internal.ctf.core.trace; import java.io.File; +import java.io.IOException; +import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; +import java.nio.channels.FileChannel.MapMode; import java.util.UUID; import org.eclipse.linuxtools.ctf.core.event.types.ArrayDefinition; @@ -223,8 +226,9 @@ public class StreamInput implements IDefinitionScope { StructDefinition tracePacketHeaderDef, StructDefinition streamPacketContextDef, BitBuffer bitBuffer) throws CTFReaderException { -// MappedByteBuffer bb = createPacketBitBuffer(fileSizeBytes, -// packetOffsetBytes, packetIndex, bitBuffer); + @SuppressWarnings("unused") + MappedByteBuffer bb = createPacketBitBuffer(fileSizeBytes, + packetOffsetBytes, packetIndex, bitBuffer); /* * Read the trace packet header if it exists. @@ -276,45 +280,45 @@ public class StreamInput implements IDefinitionScope { + ((packetIndex.getPacketSizeBits() + 7) / 8); } -// /** -// * @param fileSizeBytes -// * @param packetOffsetBytes -// * @param packetIndex -// * @param bitBuffer -// * @return -// * @throws CTFReaderException -// */ -// private MappedByteBuffer createPacketBitBuffer(long fileSizeBytes, -// long packetOffsetBytes, StreamInputPacketIndexEntry packetIndex, -// BitBuffer bitBuffer) throws CTFReaderException { -// /* -// * Initial size, it should map at least the packet header + context -// * size. -// * -// * TODO: use a less arbitrary size. -// */ -// long mapSize = 4096; -// /* -// * If there is less data remaining than what we want to map, reduce the -// * map size. -// */ -// if ((fileSizeBytes - packetIndex.getOffsetBytes()) < mapSize) { -// mapSize = fileSizeBytes - packetIndex.getOffsetBytes(); -// } -// -// /* -// * Map the packet. -// */ -// MappedByteBuffer bb; -// -// try { -// bb = fileChannel.map(MapMode.READ_ONLY, packetOffsetBytes, mapSize); -// } catch (IOException e) { -// throw new CTFReaderException(e); -// } -// bitBuffer.setByteBuffer(bb); -// return bb; -// } + /** + * @param fileSizeBytes + * @param packetOffsetBytes + * @param packetIndex + * @param bitBuffer + * @return + * @throws CTFReaderException + */ + private MappedByteBuffer createPacketBitBuffer(long fileSizeBytes, + long packetOffsetBytes, StreamInputPacketIndexEntry packetIndex, + BitBuffer bitBuffer) throws CTFReaderException { + /* + * Initial size, it should map at least the packet header + context + * size. + * + * TODO: use a less arbitrary size. + */ + long mapSize = 4096; + /* + * If there is less data remaining than what we want to map, reduce the + * map size. + */ + if ((fileSizeBytes - packetIndex.getOffsetBytes()) < mapSize) { + mapSize = fileSizeBytes - packetIndex.getOffsetBytes(); + } + + /* + * Map the packet. + */ + MappedByteBuffer bb; + + try { + bb = fileChannel.map(MapMode.READ_ONLY, packetOffsetBytes, mapSize); + } catch (IOException e) { + throw new CTFReaderException(e); + } + bitBuffer.setByteBuffer(bb); + return bb; + } private void parseTracePacketHeader(StructDefinition tracePacketHeaderDef, BitBuffer bitBuffer) throws CTFReaderException { -- 2.34.1