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 <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/59298
Reviewed-by: Hudson CI

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 fb91b4a6a26295e29d2aab67a67c2fab3a6ddc19..017888a29af7333dfc7d5a6459b5f4e03dcd5687 100644 (file)
--- 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$