[tip:perf/core] perf annotate: Remove disasm__calc_percent() from annotate_browser__calc_percent()

[tip-bot for Jiri Olsa]

Commit-ID:  e425da6caed1a2872e9543bba83488dbe4bbe3f3
Gitweb:     https://git.kernel.org/tip/e425da6caed1a2872e9543bba83488dbe4bbe3f3
Author:     Jiri Olsa <jo...@kernel.org>
AuthorDate: Wed, 11 Oct 2017 17:01:43 +0200
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Thu, 16 Nov 2017 14:45:35 -0300

perf annotate: Remove disasm__calc_percent() from 
annotate_browser__calc_percent()

Remove disasm__calc_percent() from annotate_browser__calc_percent(),
because we already have the data calculated in struct annotation_line.

Signed-off-by: Jiri Olsa <jo...@kernel.org>
Cc: Andi Kleen <a...@firstfloor.org>
Cc: David Ahern <dsah...@gmail.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Link: http://lkml.kernel.org/r/20171011150158.11895-21-jo...@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/ui/browsers/annotate.c | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c 
b/tools/perf/ui/browsers/annotate.c
index 4c54d5e..6136824 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -444,17 +444,16 @@ static void annotate_browser__calc_percent(struct 
annotate_browser *browser,
        struct map_symbol *ms = browser->b.priv;
        struct symbol *sym = ms->sym;
        struct annotation *notes = symbol__annotation(sym);
-       struct annotation_line *next;
        struct disasm_line *pos;
-       s64 len = symbol__size(sym);
 
        browser->entries = RB_ROOT;
 
        pthread_mutex_lock(&notes->lock);
 
+       symbol__calc_percent(sym, evsel);
+
        list_for_each_entry(pos, &notes->src->source, al.node) {
                struct browser_disasm_line *bpos = disasm_line__browser(pos);
-               const char *path = NULL;
                double max_percent = 0.0;
                int i;
 
@@ -463,17 +462,11 @@ static void annotate_browser__calc_percent(struct 
annotate_browser *browser,
                        continue;
                }
 
-               next = annotation_line__next(&pos->al, &notes->src->source);
-
                for (i = 0; i < browser->nr_events; i++) {
-                       struct sym_hist_entry sample;
-
-                       bpos->samples[i].percent = disasm__calc_percent(notes,
-                                               evsel->idx + i,
-                                               pos->al.offset,
-                                               next ? next->offset : len,
-                                               &path, &sample);
-                       bpos->samples[i].he = sample;
+                       struct annotation_data *sample = &pos->al.samples[i];
+
+                       bpos->samples[i].percent = sample->percent;
+                       bpos->samples[i].he      = sample->he;
 
                        if (max_percent < bpos->samples[i].percent)
                                max_percent = bpos->samples[i].percent;