perf symbols: Don't demangle parameters and such by default

Some C++ symbols have very long name and they make column length longer.
Most of them are about parameters including templates and we can ignore
such info most of time IMHO.

This patch passes DMGL_NO_OPTS by default when calling bfd_demangle().
One can still see full symbols with -v/--verbose option.

before:
  JS_CallFunctionValue(JSContext*, JSObject*, JS::Value, unsigned int, JS::Value*, JS::Value*)

after:
  JS_CallFunctionValue

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1406785662-5534-9-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index d75349979e65e87cf0a4ecacc801cfb867ce323c..ec5ec1c9d9b561f79a7cc0f5a64bda8cafcc9223 100644 (file)
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -939,8 +939,11 @@ new_symbol:
                 * to it...
                 */
                if (symbol_conf.demangle) {
-                       demangled = bfd_demangle(NULL, elf_name,
-                                                DMGL_PARAMS | DMGL_ANSI);
+                       int demangle_flags = DMGL_NO_OPTS;
+                       if (verbose)
+                               demangle_flags = DMGL_PARAMS | DMGL_ANSI;
+
+                       demangled = bfd_demangle(NULL, elf_name, demangle_flags);
                        if (demangled != NULL)
                                elf_name = demangled;
                }

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index b95e3a36d6544da912e57d04b9a5b9e19a0116f9..3f95ea0357e38e6acbb5f143711b0d6e7487a828 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -60,6 +60,7 @@ extern Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
 #endif
 
 #ifndef DMGL_PARAMS
+#define DMGL_NO_OPTS     0              /* For readability... */
 #define DMGL_PARAMS      (1 << 0)       /* Include function args */
 #define DMGL_ANSI        (1 << 1)       /* Include const, volatile, etc */
 #endif