From: Arnaldo Carvalho de Melo <acme@redhat.com>

Date: Fri, 28 Jul 2017 12:49:02 -0300

Subject: perf annotate: Fix storing per line sym_hist_entry

Git-commit: 48cc33085253d607706e68a67ac98fe2a6abdd3d

Patch-mainline: v4.14-rc1

References: bsc#1083691

​

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@intel.com>

Cc: David Ahern <dsahern@gmail.com>

Cc: Jiri Olsa <jolsa@kernel.org>

Cc: Namhyung Kim <namhyung@kernel.org>

Cc: Taeung Song <treeze.taeung@gmail.com>

Cc: Wang Nan <wangnan0@huawei.com>

Fixes: 461c17f00f40 ("perf annotate: Store the sample period in each histogram bucket")

Link: http://lkml.kernel.org/n/tip-s3dm6uyrazlpag3f0psfia07@git.kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Tony Jones <tonyj@suse.de>

---

 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 5125c2bbacaa..2dab0e5a7f2f 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) {

​

​