From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756415AbcBDMeu (ORCPT ); Thu, 4 Feb 2016 07:34:50 -0500 Received: from terminus.zytor.com ([198.137.202.10]:41657 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753178AbcBDMes (ORCPT ); Thu, 4 Feb 2016 07:34:48 -0500 Date: Thu, 4 Feb 2016 04:34:34 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, namhyung@kernel.org, dsahern@gmail.com, mingo@kernel.org, tglx@linutronix.de, jolsa@kernel.org Reply-To: jolsa@kernel.org, namhyung@kernel.org, tglx@linutronix.de, mingo@kernel.org, dsahern@gmail.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, acme@redhat.com, hpa@zytor.com In-Reply-To: <1453109064-1026-5-git-send-email-jolsa@kernel.org> References: <1453109064-1026-5-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists: Use struct perf_hpp_fmt:: idx in perf_hpp__reset_width Git-Commit-ID: 2e8b79e706f504801fbce19fa9f16f3c858a105e 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: 2e8b79e706f504801fbce19fa9f16f3c858a105e Gitweb: http://git.kernel.org/tip/2e8b79e706f504801fbce19fa9f16f3c858a105e Author: Jiri Olsa AuthorDate: Mon, 18 Jan 2016 10:24:02 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 3 Feb 2016 11:13:12 -0300 perf hists: Use struct perf_hpp_fmt::idx in perf_hpp__reset_width We are going to add dynamic hpp format fields, so we need to make the 'len' change for the format itself, not in the perf_hpp__format template. Signed-off-by: Jiri Olsa Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1453109064-1026-5-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/hist.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index d392801..5a11bf0 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -629,20 +629,12 @@ unsigned int hists__sort_list_width(struct hists *hists) void perf_hpp__reset_width(struct perf_hpp_fmt *fmt, struct hists *hists) { - int idx; - if (perf_hpp__is_sort_entry(fmt)) return perf_hpp__reset_sort_width(fmt, hists); - for (idx = 0; idx < PERF_HPP__MAX_INDEX; idx++) { - if (fmt == &perf_hpp__format[idx]) - break; - } - - if (idx == PERF_HPP__MAX_INDEX) - return; + BUG_ON(fmt->idx >= PERF_HPP__MAX_INDEX); - switch (idx) { + switch (fmt->idx) { case PERF_HPP__OVERHEAD: case PERF_HPP__OVERHEAD_SYS: case PERF_HPP__OVERHEAD_US: