aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung.kim@lge.com>2012-11-09 00:58:49 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-11-09 14:50:18 -0500
commit411279658adf6a4f5bb25ec032a39ae905bcf234 (patch)
tree1c095603d2ccf1524d3899f86bba0c43d4ee243d /tools
parent32ae1efd9d40645601cd4e09fa83a2711dd1ad6d (diff)
perf annotate: Merge same lines in summary view
The --print-line option of perf annotate command shows summary for each source line. But it didn't merge same lines so that it can appear multiple times. * before: Sorted summary for file /home/namhyung/bin/mcol ---------------------------------------------- 21.71 /home/namhyung/tmp/mcol.c:26 20.66 /home/namhyung/tmp/mcol.c:25 9.53 /home/namhyung/tmp/mcol.c:24 7.68 /home/namhyung/tmp/mcol.c:25 7.67 /home/namhyung/tmp/mcol.c:25 7.66 /home/namhyung/tmp/mcol.c:26 7.49 /home/namhyung/tmp/mcol.c:26 6.92 /home/namhyung/tmp/mcol.c:25 6.81 /home/namhyung/tmp/mcol.c:25 1.07 /home/namhyung/tmp/mcol.c:26 0.52 /home/namhyung/tmp/mcol.c:25 0.51 /home/namhyung/tmp/mcol.c:25 0.51 /home/namhyung/tmp/mcol.c:24 * after: Sorted summary for file /home/namhyung/bin/mcol ---------------------------------------------- 50.77 /home/namhyung/tmp/mcol.c:25 37.94 /home/namhyung/tmp/mcol.c:26 10.04 /home/namhyung/tmp/mcol.c:24 To do that, introduce percent_sum field so that the normal line-by-line output doesn't get changed. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1352440729-21848-1-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/annotate.c55
-rw-r--r--tools/perf/util/annotate.h1
2 files changed, 53 insertions, 3 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 435bf6d1a775..07aaeea60000 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
858 struct source_line *iter; 858 struct source_line *iter;
859 struct rb_node **p = &root->rb_node; 859 struct rb_node **p = &root->rb_node;
860 struct rb_node *parent = NULL; 860 struct rb_node *parent = NULL;
861 int ret;
861 862
862 while (*p != NULL) { 863 while (*p != NULL) {
863 parent = *p; 864 parent = *p;
864 iter = rb_entry(parent, struct source_line, node); 865 iter = rb_entry(parent, struct source_line, node);
865 866
866 if (src_line->percent > iter->percent) 867 ret = strcmp(iter->path, src_line->path);
868 if (ret == 0) {
869 iter->percent_sum += src_line->percent;
870 return;
871 }
872
873 if (ret < 0)
874 p = &(*p)->rb_left;
875 else
876 p = &(*p)->rb_right;
877 }
878
879 src_line->percent_sum = src_line->percent;
880
881 rb_link_node(&src_line->node, parent, p);
882 rb_insert_color(&src_line->node, root);
883}
884
885static void __resort_source_line(struct rb_root *root, struct source_line *src_line)
886{
887 struct source_line *iter;
888 struct rb_node **p = &root->rb_node;
889 struct rb_node *parent = NULL;
890
891 while (*p != NULL) {
892 parent = *p;
893 iter = rb_entry(parent, struct source_line, node);
894
895 if (src_line->percent_sum > iter->percent_sum)
867 p = &(*p)->rb_left; 896 p = &(*p)->rb_left;
868 else 897 else
869 p = &(*p)->rb_right; 898 p = &(*p)->rb_right;
@@ -873,6 +902,24 @@ static void insert_source_line(struct rb_root *root, struct source_line *src_lin
873 rb_insert_color(&src_line->node, root); 902 rb_insert_color(&src_line->node, root);
874} 903}
875 904
905static void resort_source_line(struct rb_root *dest_root, struct rb_root *src_root)
906{
907 struct source_line *src_line;
908 struct rb_node *node;
909
910 node = rb_first(src_root);
911 while (node) {
912 struct rb_node *next;
913
914 src_line = rb_entry(node, struct source_line, node);
915 next = rb_next(node);
916 rb_erase(node, src_root);
917
918 __resort_source_line(dest_root, src_line);
919 node = next;
920 }
921}
922
876static void symbol__free_source_line(struct symbol *sym, int len) 923static void symbol__free_source_line(struct symbol *sym, int len)
877{ 924{
878 struct annotation *notes = symbol__annotation(sym); 925 struct annotation *notes = symbol__annotation(sym);
@@ -897,6 +944,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map,
897 struct source_line *src_line; 944 struct source_line *src_line;
898 struct annotation *notes = symbol__annotation(sym); 945 struct annotation *notes = symbol__annotation(sym);
899 struct sym_hist *h = annotation__histogram(notes, evidx); 946 struct sym_hist *h = annotation__histogram(notes, evidx);
947 struct rb_root tmp_root = RB_ROOT;
900 948
901 if (!h->sum) 949 if (!h->sum)
902 return 0; 950 return 0;
@@ -931,12 +979,13 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map,
931 goto next; 979 goto next;
932 980
933 strcpy(src_line[i].path, path); 981 strcpy(src_line[i].path, path);
934 insert_source_line(root, &src_line[i]); 982 insert_source_line(&tmp_root, &src_line[i]);
935 983
936 next: 984 next:
937 pclose(fp); 985 pclose(fp);
938 } 986 }
939 987
988 resort_source_line(root, &tmp_root);
940 return 0; 989 return 0;
941} 990}
942 991
@@ -960,7 +1009,7 @@ static void print_summary(struct rb_root *root, const char *filename)
960 char *path; 1009 char *path;
961 1010
962 src_line = rb_entry(node, struct source_line, node); 1011 src_line = rb_entry(node, struct source_line, node);
963 percent = src_line->percent; 1012 percent = src_line->percent_sum;
964 color = get_percent_color(percent); 1013 color = get_percent_color(percent);
965 path = src_line->path; 1014 path = src_line->path;
966 1015
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index c6272011625a..8eec94358a4a 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -76,6 +76,7 @@ struct sym_hist {
76struct source_line { 76struct source_line {
77 struct rb_node node; 77 struct rb_node node;
78 double percent; 78 double percent;
79 double percent_sum;
79 char *path; 80 char *path;
80}; 81};
81 82