perf, tools: Demangle cloned functions
PATCH 1/1 perf, tools: Demangle cloned functions
From: Andi Kleen <[email protected]>
The libbfd C++ demangler doesn't seem to deal with cloned functions, like symbol.clone.NUM.
Just strip the dot part before demangling and add it back later.
Signed-off-by Andi Kleen <[email protected]>
--- tools/perf/util/symbol-elf.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
tools/perf/util/symbol-elf.c +26 -1
@@ -912,8 +912,33 @@ int dso__load_sym(struct dso *dso, struct map *map,* to it... */ if (symbol_conf.demangle) { - demangled =bfd_demangle (NULL , elf_name, +/* +* The demangler doesn't deal with cloned functions. +* XXXX.clone.NUM or similar +* Strip the dot part and readd it later. +*/ +char *p = (char *)elf_name, *dot; + dot =strchr (elf_name,'.' ); +if (dot) { + p =strdup (elf_name); +if (!p) + goto new_symbol; + dot =strchr (p,'.' ); + *dot =0 ; + } + + demangled =bfd_demangle (NULL , p,DMGL_PARAMS |DMGL_ANSI ); +if (dot) + *dot ='.' ; +if (demangled && dot) { + demangled =realloc (demangled,strlen (demangled) +strlen (dot) +1 ); +if (!demangled) + goto new_symbol; +strcpy (demangled + (dot - p), dot); + } +if (p != elf_name) +free (p);if (demangled !=NULL ) elf_name = demangled; }
Signature · 1 line
1.8.3.1
tip-bot for Andi Kleen
merge bot[tip:perf/urgent] perf symbols: Demangle cloned functions
perf symbols: Demangle cloned functions
Commit-ID: de95ab53645a2f0015e0f68ee723f18dce2b8b51 Gitweb: http://git.kernel.org/tip/de95ab53645a2f0015e0f68ee723f18dce2b8b51 Author: Andi Kleen <[email protected]> AuthorDate: Thu, 12 Sep 2013 08:16:38 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 25 Sep 2013 12:58:21 -0300
perf symbols: Demangle cloned functions
The libbfd C++ demangler doesn't seem to deal with cloned functions, like symbol.clone.NUM.
Just strip the dot part before demangling and add it back later.
Signed-off-by Andi Kleen <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/symbol-elf.c | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-)
tools/perf/util/symbol-elf.c +26 -1
@@ -928,8 +928,33 @@ int dso__load_sym(struct dso *dso, struct map *map,* to it... */ if (symbol_conf.demangle) { - demangled =bfd_demangle (NULL , elf_name, +/* +* The demangler doesn't deal with cloned functions. +* XXXX.clone.NUM or similar +* Strip the dot part and readd it later. +*/ +char *p = (char *)elf_name, *dot; + dot =strchr (elf_name,'.' ); +if (dot) { + p =strdup (elf_name); +if (!p) + goto new_symbol; + dot =strchr (p,'.' ); + *dot =0 ; + } + + demangled =bfd_demangle (NULL , p,DMGL_PARAMS |DMGL_ANSI ); +if (dot) + *dot ='.' ; +if (demangled && dot) { + demangled =realloc (demangled,strlen (demangled) +strlen (dot) +1 ); +if (!demangled) + goto new_symbol; +strcpy (demangled + (dot - p), dot); + } +if (p != elf_name) +free (p);if (demangled !=NULL ) elf_name = demangled; }