diff options
author | Taeung Song <treeze.taeung@gmail.com> | 2017-03-27 03:10:37 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-03-27 14:04:56 -0400 |
commit | 2e933b1274dc89cd1629f6c7fd9bf952248d84c2 (patch) | |
tree | b803a138c09dd2c897e3d3981ebdb0e5e971dd6f /tools/perf/util/annotate.c | |
parent | 6ebd2547dd24daf95a21b2bc59931de8502afcc3 (diff) |
perf annotate: Fix a bug of division by zero when calculating percent
Currently perf-annotate with --print-line can print
-nan(0x8000000000000) because of division by zero when calculating
percent. The division by zero happens when a sum of samples is zero in
symbol__get_source_line(), so fix it.
For example:
After running 'perf record' like below,
$ perf record -e "{cycles,page-faults,branch-misses}" ./a.out
Before:
$ perf annotate --stdio -l
Sorted summary for file /home/taeung/workspace/a.out
----------------------------------------------
32.89 -nan 7.04 a.c:38
25.14 -nan 0.00 a.c:34
16.26 -nan 56.34 a.c:31
15.88 -nan 1.41 a.c:37
5.67 -nan 0.00 a.c:39
1.13 -nan 35.21 a.c:26
0.95 -nan 0.00 a.c:44
0.57 -nan 0.00 a.c:32
Percent | Source code & Disassembly of a.out for cycles (529 samples)
-----------------------------------------------------------------------------------------
:
...
a.c:26 0.57 -nan 4.23 : 40081a: mov %edi,-0x24(%rbp)
a.c:26 0.00 -nan 9.86 : 40081d: mov %rsi,-0x30(%rbp)
...
However, if a sum of samples is zero (e.g. 'page-faults'),
skip calculating percent.
After:
$ perf annotate --stdio -l
Sorted summary for file /home/taeung/workspace/a.out
----------------------------------------------
32.89 0.00 7.04 a.c:38
25.14 0.00 0.00 a.c:34
16.26 0.00 56.34 a.c:31
15.88 0.00 1.41 a.c:37
5.67 0.00 0.00 a.c:39
1.13 0.00 35.21 a.c:26
0.95 0.00 0.00 a.c:44
0.57 0.00 0.00 a.c:32
Percent | Source code & Disassembly of old for cycles (529 samples)
-----------------------------------------------------------------------------------------
:
...
a.c:26 0.57 0.00 4.23 : 40081a: mov %edi,-0x24(%rbp)
a.c:26 0.00 0.00 9.86 : 40081d: mov %rsi,-0x30(%rbp)
...
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1490598638-13947-3-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.c')
-rw-r--r-- | tools/perf/util/annotate.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 6dc9148b9b84..11af5f0d56cc 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c | |||
@@ -1671,11 +1671,15 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, | |||
1671 | src_line->nr_pcnt = nr_pcnt; | 1671 | src_line->nr_pcnt = nr_pcnt; |
1672 | 1672 | ||
1673 | for (k = 0; k < nr_pcnt; k++) { | 1673 | for (k = 0; k < nr_pcnt; k++) { |
1674 | double percent = 0.0; | ||
1675 | |||
1674 | h = annotation__histogram(notes, evidx + k); | 1676 | h = annotation__histogram(notes, evidx + k); |
1675 | src_line->samples[k].percent = 100.0 * h->addr[i] / h->sum; | 1677 | if (h->sum) |
1678 | percent = 100.0 * h->addr[i] / h->sum; | ||
1676 | 1679 | ||
1677 | if (src_line->samples[k].percent > percent_max) | 1680 | if (percent > percent_max) |
1678 | percent_max = src_line->samples[k].percent; | 1681 | percent_max = percent; |
1682 | src_line->samples[k].percent = percent; | ||
1679 | } | 1683 | } |
1680 | 1684 | ||
1681 | if (percent_max <= 0.5) | 1685 | if (percent_max <= 0.5) |