Skip to content

Commit e1327ea

Browse files
ctf: improve error message for UUID missmatch
Change-Id: I4f4b8960fd9933c80d182c80548fc4cc66e06ce8 Signed-off-by: Matthew Khouzam <[email protected]>
1 parent e76953c commit e1327ea

File tree

1 file changed

+8
-2
lines changed
  • ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/trace

1 file changed

+8
-2
lines changed

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/ctf/core/trace/CTFStreamInput.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ private BitBuffer createBitBufferForPacketHeader(FileChannel fc, long dataOffset
299299
* create a packet bit buffer to read the packet header
300300
*/
301301
int maximumSize = fStreamPacketContextDecl.getMaximumSize() + fTracePacketHeaderDecl.getMaximumSize();
302-
BitBuffer bitBuffer = new BitBuffer(createPacketBitBuffer(fc, dataOffsetbits/Byte.SIZE, maximumSize));
302+
BitBuffer bitBuffer = new BitBuffer(createPacketBitBuffer(fc, dataOffsetbits / Byte.SIZE, maximumSize));
303303
bitBuffer.setByteOrder(getStream().getTrace().getByteOrder());
304304
return bitBuffer;
305305
}
@@ -372,7 +372,13 @@ private StructDefinition parseTracePacketHeader(
372372
}
373373
if (!Objects.equals(getStream().getTrace().getUUID(), uuid) && !fUUIDMismatchWarning) {
374374
fUUIDMismatchWarning = true;
375-
CtfCoreLoggerUtil.logWarning("Reading CTF trace: UUID mismatch for trace " + getStream().getTrace()); //$NON-NLS-1$
375+
CtfCoreLoggerUtil.logWarning(String.format(
376+
"Reading CTF trace stream %d: UUID mismatch for trace %s.\nMetadata UUID: %s, Stream UUID: %s", //$NON-NLS-1$
377+
getStream().getId(),
378+
getStream().getTrace(),
379+
getStream().getTrace().getUUID(),
380+
uuid
381+
));
376382
}
377383
if (streamIDDef != null) {
378384
long streamID = streamIDDef.getValue();

0 commit comments

Comments
 (0)