[tip:perf/core] perf annotate: Fix storing per line sym_hist_entry
From: tip-bot for Arnaldo Carvalho de Melo
Date: Sun Jul 30 2017 - 05:42:47 EST
Commit-ID: 48cc33085253d607706e68a67ac98fe2a6abdd3d
Gitweb: http://git.kernel.org/tip/48cc33085253d607706e68a67ac98fe2a6abdd3d
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Fri, 28 Jul 2017 12:49:02 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Fri, 28 Jul 2017 12:53:05 -0300
perf annotate: Fix storing per line sym_hist_entry
The existing loop incremented the offset while using it as the array
index, when we went to an array of sym_hist_entry instances, we
should've moved the increment to outside of the array element reference,
oops, fix it.
Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Taeung Song <treeze.taeung@xxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Fixes: 461c17f00f40 ("perf annotate: Store the sample period in each histogram bucket")
Link: http://lkml.kernel.org/n/tip-s3dm6uyrazlpag3f0psfia07@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/util/annotate.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
index 5125c2b..2dab0e5 100644
--- a/tools/perf/util/annotate.c
+++ b/tools/perf/util/annotate.c
@@ -963,8 +963,9 @@ double disasm__calc_percent(struct annotation *notes, int evidx, s64 offset,
u64 period = 0;
while (offset < end) {
- hits += h->addr[offset++].nr_samples;
- period += h->addr[offset++].period;
+ hits += h->addr[offset].nr_samples;
+ period += h->addr[offset].period;
+ ++offset;
}
if (h->nr_samples) {