Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Montplaisir2015-02-10 18:43:52 +0000
committerAlexandre Montplaisir2015-02-10 22:59:10 +0000
commita9b1f3679c21655f4f4aef6faeba833de477d925 (patch)
tree04e600bb0e2b13ccaba0ce5eda74026d2144bac5 /org.eclipse.tracecompass.tmf.ui
parent9049e763da29fb31b95b080db21561290c83cc8f (diff)
downloadorg.eclipse.tracecompass-a9b1f3679c21655f4f4aef6faeba833de477d925.tar.gz
org.eclipse.tracecompass-a9b1f3679c21655f4f4aef6faeba833de477d925.tar.xz
org.eclipse.tracecompass-a9b1f3679c21655f4f4aef6faeba833de477d925.zip
tmf: Handle spaces in function names in the Callstack View
De-mangled C++ symbol names may contain spaces, so the function name reader must not split around these spaces. Also mention in the documentation that 'nm --demangle' can be used to get readable C++ function names. Refs bug #459534. Change-Id: Ib046a15ada590b389bb8d1af2983e00629d17a35 Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im> Reviewed-on: https://git.eclipse.org/r/41561 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Tested-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Diffstat (limited to 'org.eclipse.tracecompass.tmf.ui')
-rw-r--r--org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/FunctionNameMapper.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/FunctionNameMapper.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/FunctionNameMapper.java
index 179425167e..62e908bd84 100644
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/FunctionNameMapper.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/callstack/FunctionNameMapper.java
@@ -52,8 +52,8 @@ class FunctionNameMapper {
try (FileReader fr = new FileReader(mappingFile);
BufferedReader reader = new BufferedReader(fr);) {
for (String line = reader.readLine(); line != null; line = reader.readLine()) {
- String[] elems = line.split(" "); //$NON-NLS-1$
/* Only lines with 3 elements contain addresses */
+ String[] elems = line.split(" ", 3); //$NON-NLS-1$
if (elems.length == 3) {
/* Strip the leading zeroes from the address */
String address = elems[0].replaceFirst("^0+(?!$)", ""); //$NON-NLS-1$ //$NON-NLS-2$;

Back to the top