From 91fdda3ef2885d2e5008509dc466b5161b12df6f Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 29 Oct 2015 18:34:21 -0400 Subject: [PATCH] lttng: Remove discriminator part when parsing addr2line output Remove discriminator part, for example: /build/buildd/glibc-2.21/elf/dl-object.c:78 (discriminator 8) This fixed a NumberFormatException Change-Id: I92682bee4106d64dcf2964dc98823a80597df3fa Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/59298 Reviewed-by: Hudson CI --- .../lttng2/ust/core/analysis/debuginfo/FileOffsetMapper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/analysis/debuginfo/FileOffsetMapper.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/analysis/debuginfo/FileOffsetMapper.java index fb91b4a6a2..017888a29a 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/analysis/debuginfo/FileOffsetMapper.java +++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/internal/lttng2/ust/core/analysis/debuginfo/FileOffsetMapper.java @@ -32,6 +32,7 @@ import org.eclipse.tracecompass.tmf.core.event.lookup.TmfCallsite; */ public final class FileOffsetMapper { + private static final String DISCRIMINATOR = "\\(discriminator.*\\)"; private static final String ADDR2LINE_EXECUTABLE = "addr2line"; //$NON-NLS-1$ private FileOffsetMapper() {} @@ -70,6 +71,9 @@ public final class FileOffsetMapper { } for (String outputLine : output) { + // Remove discriminator part, for example: /build/buildd/glibc-2.21/elf/dl-object.c:78 (discriminator 8) + outputLine = outputLine.replaceFirst(DISCRIMINATOR, "").trim(); //$NON-NLS-1$ + String[] elems = outputLine.split(":"); //$NON-NLS-1$ String fileName = elems[0]; if (fileName.equals("??")) { //$NON-NLS-1$ -- 2.34.1