From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DF7BC4321D for ; Sat, 18 Aug 2018 11:28:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2FC5B2146E for ; Sat, 18 Aug 2018 11:28:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2FC5B2146E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=zytor.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726634AbeHROgE (ORCPT ); Sat, 18 Aug 2018 10:36:04 -0400 Received: from terminus.zytor.com ([198.137.202.136]:40159 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726272AbeHROgE (ORCPT ); Sat, 18 Aug 2018 10:36:04 -0400 Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id w7IBSLfr1285957 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sat, 18 Aug 2018 04:28:21 -0700 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id w7IBSLjU1285954; Sat, 18 Aug 2018 04:28:21 -0700 Date: Sat, 18 Aug 2018 04:28:21 -0700 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Jiri Olsa Message-ID: Cc: peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, namhyung@kernel.org, eranian@google.com, acme@redhat.com, dsahern@gmail.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com Reply-To: hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, mingo@kernel.org, eranian@google.com, namhyung@kernel.org, acme@redhat.com, dsahern@gmail.com, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, jolsa@kernel.org In-Reply-To: <20180804130521.11408-7-jolsa@kernel.org> References: <20180804130521.11408-7-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Rename hist to sym_hist in annotation__calc_percent Git-Commit-ID: 48a1e4f2381387a097ea9f7897c5c32e9aaa708d 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 48a1e4f2381387a097ea9f7897c5c32e9aaa708d Gitweb: https://git.kernel.org/tip/48a1e4f2381387a097ea9f7897c5c32e9aaa708d Author: Jiri Olsa AuthorDate: Sat, 4 Aug 2018 15:05:07 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 8 Aug 2018 15:55:47 -0300 perf annotate: Rename hist to sym_hist in annotation__calc_percent We will need to bring in 'struct hists' variable in this scope, so it's better we do this rename first. Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/20180804130521.11408-7-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 8bd278a71004..728603636adc 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1753,7 +1753,7 @@ out_close_stdout: goto out_free_command; } -static void calc_percent(struct sym_hist *hist, +static void calc_percent(struct sym_hist *sym_hist, struct annotation_data *data, s64 offset, s64 end) { @@ -1761,15 +1761,15 @@ static void calc_percent(struct sym_hist *hist, u64 period = 0; while (offset < end) { - hits += hist->addr[offset].nr_samples; - period += hist->addr[offset].period; + hits += sym_hist->addr[offset].nr_samples; + period += sym_hist->addr[offset].period; ++offset; } - if (hist->nr_samples) { + if (sym_hist->nr_samples) { data->he.period = period; data->he.nr_samples = hits; - data->percent = 100.0 * hits / hist->nr_samples; + data->percent = 100.0 * hits / sym_hist->nr_samples; } } @@ -1790,12 +1790,12 @@ static void annotation__calc_percent(struct annotation *notes, for (i = 0; i < al->data_nr; i++) { struct annotation_data *data; - struct sym_hist *hist; + struct sym_hist *sym_hist; - hist = annotation__histogram(notes, evsel->idx + i); + sym_hist = annotation__histogram(notes, evsel->idx + i); data = &al->data[i]; - calc_percent(hist, data, al->offset, end); + calc_percent(sym_hist, data, al->offset, end); } } }