commit 54e43e5611747536da33665178a8c57a4670939b
author Matthew Khouzam <matthew.khouzam@ericsson.com> Thu May 10 13:56:52 2018 -0400
committer Matthew Khouzam <matthew.khouzam@ericsson.com> Tue Jun 12 20:35:22 2018 -0400
tree 9798da1700591063bb95b9bf6a2f1f3b0a7cc6d7
parent 6b5b8306d154643b712bdf71ba403d944ffacd99

ust.core: make debug analysis work with Windows

Java.IO file actually supports mixed paths such as 'c:\user' and '/home'
in windows.

Tested on Windows 7.

Bug: 535816

Change-Id: If24c03b8fff045b4301d88ac1f901f84ee55ced6
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/124421
Tested-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Reviewed-by: Jean-Christian Kouame <jean-christian.kouame@ericsson.com>
Tested-by: CI Bot

lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java

diff --git a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java
index aef3ee6..1cfdbea 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.ust.core/src/org/eclipse/tracecompass/lttng2/ust/core/analysis/debuginfo/UstDebugInfoBinaryAspect.java
@@ -11,6 +11,8 @@
 
 import static org.eclipse.tracecompass.common.core.NonNullUtils.nullToEmptyString;
 
+import java.io.File;
+
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.tracecompass.lttng2.ust.core.trace.LttngUstTrace;
 import org.eclipse.tracecompass.lttng2.ust.core.trace.layout.ILttngUstEventLayout;
@@ -108,7 +110,8 @@
         }
 
         /* Apply the path prefix defined by the trace, if any */
-        String fullPath = (trace.getSymbolProviderConfig().getActualRootDirPath() + file.getFilePath());
+
+        String fullPath = new File(trace.getSymbolProviderConfig().getActualRootDirPath(), file.getFilePath()).toString();
 
         long offset;
         if (file.isPic()) {