2 files changed, 53 insertions, 3 deletions

diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 435bf6d1a77..07aaeea6000 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -858,12 +858,41 @@ static void insert_source_line(struct rb_root *root, struct source_line *src_lin
         struct source_line *iter;
         struct rb_node **p = &root->rb_node;
         struct rb_node *parent = NULL;
+        int ret;
 
         while (*p != NULL) {
                 parent = *p;
                 iter = rb_entry(parent, struct source_line, node);
 
-                if (src_line->percent > iter->percent)
+                ret = strcmp(iter->path, src_line->path);
+                if (ret == 0) {
+                        iter->percent_sum += src_line->percent;
+                        return;
+                }
+
+                if (ret < 0)
+                        p = &(*p)->rb_left;
+                else
+                        p = &(*p)->rb_right;
+        }
+
+        src_line->percent_sum = src_line->percent;
+
+        rb_link_node(&src_line->node, parent, p);
+        rb_insert_color(&src_line->node, root);
+}
+
+static void __resort_source_line(struct rb_root *root, struct source_line *src_line)
+{
+        struct source_line *iter;
+        struct rb_node **p = &root->rb_node;
+        struct rb_node *parent = NULL;
+
+        while (*p != NULL) {
+                parent = *p;
+                iter = rb_entry(parent, struct source_line, node);
+
+                if (src_line->percent_sum > iter->percent_sum)
                         p = &(*p)->rb_left;
                 else
                         p = &(*p)->rb_right;
@@ -873,6 +902,24 @@ static void insert_source_line(struct rb_root *root, struct source_line *src_lin
         rb_insert_color(&src_line->node, root);
 }
 
+static void resort_source_line(struct rb_root *dest_root, struct rb_root *src_root)
+{
+        struct source_line *src_line;
+        struct rb_node *node;
+
+        node = rb_first(src_root);
+        while (node) {
+                struct rb_node *next;
+
+                src_line = rb_entry(node, struct source_line, node);
+                next = rb_next(node);
+                rb_erase(node, src_root);
+
+                __resort_source_line(dest_root, src_line);
+                node = next;
+        }
+}
+
 static void symbol__free_source_line(struct symbol *sym, int len)
 {
         struct annotation *notes = symbol__annotation(sym);
@@ -897,6 +944,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map,
         struct source_line *src_line;
         struct annotation *notes = symbol__annotation(sym);
         struct sym_hist *h = annotation__histogram(notes, evidx);
+        struct rb_root tmp_root = RB_ROOT;
 
         if (!h->sum)
                 return 0;
@@ -931,12 +979,13 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map,
                         goto next;
 
                 strcpy(src_line[i].path, path);
-                insert_source_line(root, &src_line[i]);
+                insert_source_line(&tmp_root, &src_line[i]);
 
         next:
                 pclose(fp);
         }
 
+        resort_source_line(root, &tmp_root);
         return 0;
 }
 
@@ -960,7 +1009,7 @@ static void print_summary(struct rb_root *root, const char *filename)
                 char *path;
 
                 src_line = rb_entry(node, struct source_line, node);
-                percent = src_line->percent;
+                percent = src_line->percent_sum;
                 color = get_percent_color(percent);
                 path = src_line->path;
 
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index c6272011625..8eec94358a4 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -76,6 +76,7 @@ struct sym_hist {
 struct source_line {
         struct rb_node  node;
         double          percent;
+        double          percent_sum;
         char            *path;
 };