From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbdG3Jmm (ORCPT ); Sun, 30 Jul 2017 05:42:42 -0400 Received: from terminus.zytor.com ([65.50.211.136]:33163 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750805AbdG3Jmk (ORCPT ); Sun, 30 Jul 2017 05:42:40 -0400 Date: Sun, 30 Jul 2017 02:40:27 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: treeze.taeung@gmail.com, wangnan0@huawei.com, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, jolsa@kernel.org, dsahern@gmail.com Reply-To: dsahern@gmail.com, adrian.hunter@intel.com, jolsa@kernel.org, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, treeze.taeung@gmail.com, wangnan0@huawei.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf annotate: Fix storing per line sym_hist_entry Git-Commit-ID: 48cc33085253d607706e68a67ac98fe2a6abdd3d X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 48cc33085253d607706e68a67ac98fe2a6abdd3d Gitweb: http://git.kernel.org/tip/48cc33085253d607706e68a67ac98fe2a6abdd3d Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 28 Jul 2017 12:49:02 -0300 Committer: Arnaldo Carvalho de Melo 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 Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Taeung Song Cc: Wang Nan 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 --- 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) {