1 files changed, 30 insertions, 19 deletions

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index fa347b169e27..a91d7b186081 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -603,6 +603,33 @@ struct disasm_line *disasm__get_next_ip_line(struct list_head *head, struct disa
         return NULL;
 }
 
+static double disasm__calc_percent(struct disasm_line *next,
+                                   struct annotation *notes, int evidx,
+                                   s64 offset, u64 len, const char **path)
+{
+        struct source_line *src_line = notes->src->lines;
+        struct sym_hist *h = annotation__histogram(notes, evidx);
+        unsigned int hits = 0;
+        double percent = 0.0;
+
+        while (offset < (s64)len &&
+               (next == NULL || offset < next->offset)) {
+                if (src_line) {
+                        if (*path == NULL)
+                                *path = src_line[offset].path;
+                        percent += src_line[offset].percent;
+                } else
+                        hits += h->addr[offset];
+
+                ++offset;
+        }
+
+        if (src_line == NULL && h->sum)
+                percent = 100.0 * hits / h->sum;
+
+        return percent;
+}
+
 static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 start,
                       struct perf_evsel *evsel, u64 len, int min_pcnt, int printed,
                       int max_lines, struct disasm_line *queue)
@@ -612,33 +639,17 @@ static int disasm_line__print(struct disasm_line *dl, struct symbol *sym, u64 st
 
         if (dl->offset != -1) {
                 const char *path = NULL;
-                unsigned int hits = 0;
-                double percent = 0.0;
+                double percent;
                 const char *color;
                 struct annotation *notes = symbol__annotation(sym);
-                struct source_line *src_line = notes->src->lines;
-                struct sym_hist *h = annotation__histogram(notes, evsel->idx);
                 s64 offset = dl->offset;
                 const u64 addr = start + offset;
                 struct disasm_line *next;
 
                 next = disasm__get_next_ip_line(&notes->src->source, dl);
 
-                while (offset < (s64)len &&
-                       (next == NULL || offset < next->offset)) {
-                        if (src_line) {
-                                if (path == NULL)
-                                        path = src_line[offset].path;
-                                percent += src_line[offset].percent;
-                        } else
-                                hits += h->addr[offset];
-
-                        ++offset;
-                }
-
-                if (src_line == NULL && h->sum)
-                        percent = 100.0 * hits / h->sum;
-
+                percent = disasm__calc_percent(next, notes, evsel->idx,
+                                               offset, len, &path);
                 if (percent < min_pcnt)
                         return -1;