diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-27 15:47:59 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-27 15:47:59 +0400 |
| commit | b6e53f321ee6f4b237d8cc54fbace3217fa96e05 (patch) | |
| tree | 40c47bafa6bc1321e0ab2be82a5e4d618c1caa8b /tools/perf/util/annotate.c | |
| parent | e3703f8cdfcf39c25c4338c3ad8e68891cca3731 (diff) | |
| parent | 98e9f03bbf2cb21a60f94b8b700eb5d38470819d (diff) | |
| download | linux-b6e53f321ee6f4b237d8cc54fbace3217fa96e05.tar.xz | |
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
* Fix annotation on stdio/GTK+ interfaces (Namhyung Kim)
* Fix file descriptor leaking while searching DSOs for suitable symtab (Namhyung Kim).
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/annotate.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 469eb679fb9d..3aa555ff9d89 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -8,6 +8,8 @@ */ #include "util.h" +#include "ui/ui.h" +#include "sort.h" #include "build-id.h" #include "color.h" #include "cache.h" @@ -489,7 +491,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, { struct annotation *notes; - if (sym == NULL || use_browser != 1 || !sort__has_sym) + if (sym == NULL) return 0; notes = symbol__annotation(sym); @@ -1399,3 +1401,8 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize) { return symbol__annotate(he->ms.sym, he->ms.map, privsize); } + +bool ui__has_annotation(void) +{ + return use_browser == 1 && sort__has_sym; +} |