summaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2017-11-15 12:20:08 +0100
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-11-17 16:16:26 +0100
commit05d3f1a1d5a3d37ca4b591d5524f5a5b159d0564 (patch)
tree6fea5cd8024e59803c2e8f6ddf343280c9c7ae17 /tools/perf/util
parentperf tools: Change (symbol|annotation)__calc_percent return type to void (diff)
downloadlinux-05d3f1a1d5a3d37ca4b591d5524f5a5b159d0564.tar.xz
linux-05d3f1a1d5a3d37ca4b591d5524f5a5b159d0564.zip
perf tools: Move symbol__calc_percent() call to outside symbol__disassemble()
We need to call symbol__calc_percent() periodicaly for top, so it's no longer convenient to keep it in symbol__disassemble(). Let's separate the symbol__disassemble() to allocate and init the symbol annotation structs and symbol__calc_percent() to compute the lines percentages based on symbol hists data. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/n/tip-gtnp8t4tb00q6lag07psn5nq@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/annotate.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 846abb4955ac..22ea7936d92f 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -1653,12 +1653,7 @@ int symbol__annotate(struct symbol *sym, struct map *map,
}
}
- err = symbol__disassemble(sym, &args);
- if (!err)
- symbol__calc_percent(sym, evsel);
-
- return err;
-
+ return symbol__disassemble(sym, &args);
}
static void insert_source_line(struct rb_root *root, struct annotation_line *al)
@@ -2005,6 +2000,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
if (symbol__annotate(sym, map, evsel, 0, NULL, NULL) < 0)
return -1;
+ symbol__calc_percent(sym, evsel);
+
if (print_lines) {
srcline_full_filename = full_paths;
symbol__calc_lines(sym, map, &source_line);