diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-11-20 02:32:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-11-20 02:32:01 -0500 |
commit | 4e6e311e596eadba30d4f56f64eae7d45611a01c (patch) | |
tree | 681fb4c9ae7320ab1192f92e1c153ab35c90bf8e /tools/perf/ui/browsers/hists.c | |
parent | 2565711fb7d7c28e0cd93c8971b520d1b10b857c (diff) | |
parent | a84808083688d82d7f1e5786ccf5df0ff7d448cb (diff) |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible fixes:
- Fallback to kallsyms when using the minimal 'ELF' loader (Arnaldo Carvalho de Melo)
- Fix annotation with kcore (Adrian Hunter)
- Fix up srcline histogram key formatting (Arnaldo Carvalho de Melo)
- Add missing handler for PERF_RECORD_MMAP2 events in 'perf diff' (Kan Liang)
User visible changes/new features:
- Only print base source file for srcline histogram sort key (Andi Kleen)
- Support source line numbers in annotate using a hotkey (Andi Kleen)
Infrastructure changes and fixes:
- Do not poll events that use the system_wide flag (Adrian Hunter)
- Add perf-read-vdso32 and perf-read-vdsox32 to .gitignore (Adrian Hunter)
- Only override the default :tid comm entry (Adrian Hunter)
- Factor out adding new call chain entries (Andi Kleen)
- Use al.addr to set up call chain (Andi Kleen)
- Use a common function to resolve symbol or name (Andi Kleen)
- Fix ftrace:function event recording (Jiri Olsa)
- Move disable_buildid_cache() to util/build-id.c (Namhyung Kim)
- Clean up libelf feature support code (Namhyung Kim)
- Fix typo in python 'perf test' (WANG Chao)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/ui/browsers/hists.c')
-rw-r--r-- | tools/perf/ui/browsers/hists.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index cfb976b3de3a..12c17c5a3d68 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c | |||
@@ -463,23 +463,6 @@ out: | |||
463 | return key; | 463 | return key; |
464 | } | 464 | } |
465 | 465 | ||
466 | static char *callchain_list__sym_name(struct callchain_list *cl, | ||
467 | char *bf, size_t bfsize, bool show_dso) | ||
468 | { | ||
469 | int printed; | ||
470 | |||
471 | if (cl->ms.sym) | ||
472 | printed = scnprintf(bf, bfsize, "%s", cl->ms.sym->name); | ||
473 | else | ||
474 | printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip); | ||
475 | |||
476 | if (show_dso) | ||
477 | scnprintf(bf + printed, bfsize - printed, " %s", | ||
478 | cl->ms.map ? cl->ms.map->dso->short_name : "unknown"); | ||
479 | |||
480 | return bf; | ||
481 | } | ||
482 | |||
483 | struct callchain_print_arg { | 466 | struct callchain_print_arg { |
484 | /* for hists browser */ | 467 | /* for hists browser */ |
485 | off_t row_offset; | 468 | off_t row_offset; |