From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759991AbcBYHns (ORCPT ); Thu, 25 Feb 2016 02:43:48 -0500 Received: from torg.zytor.com ([198.137.202.12]:57504 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1759548AbcBYHno (ORCPT ); Thu, 25 Feb 2016 02:43:44 -0500 Date: Wed, 24 Feb 2016 23:43:06 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: andi@firstfloor.org, hpa@zytor.com, eranian@google.com, dsahern@gmail.com, wangnan0@huawei.com, namhyung@kernel.org, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, peterz@infradead.org, tglx@linutronix.de Reply-To: jolsa@kernel.org, mingo@kernel.org, tglx@linutronix.de, peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org, hpa@zytor.com, dsahern@gmail.com, eranian@google.com, andi@firstfloor.org, namhyung@kernel.org, wangnan0@huawei.com In-Reply-To: <1456326830-30456-9-git-send-email-namhyung@kernel.org> References: <1456326830-30456-9-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf hists: Count number of sort keys Git-Commit-ID: 1f2d72cf3258eacd667cd1920e64c9b64b9984d5 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: 1f2d72cf3258eacd667cd1920e64c9b64b9984d5 Gitweb: http://git.kernel.org/tip/1f2d72cf3258eacd667cd1920e64c9b64b9984d5 Author: Namhyung Kim AuthorDate: Thu, 25 Feb 2016 00:13:40 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 24 Feb 2016 20:21:11 -0300 perf hists: Count number of sort keys It'll be used for hierarchy output mode to indent entries properly. Signed-off-by: Namhyung Kim Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Wang Nan Link: http://lkml.kernel.org/r/1456326830-30456-9-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/hist.c | 3 +++ tools/perf/util/hist.h | 1 + 2 files changed, 4 insertions(+) diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c index 12223d7..edbf854 100644 --- a/tools/perf/ui/hist.c +++ b/tools/perf/ui/hist.c @@ -514,6 +514,9 @@ void perf_hpp_list__column_register(struct perf_hpp_list *list, void perf_hpp_list__register_sort_field(struct perf_hpp_list *list, struct perf_hpp_fmt *format) { + if (perf_hpp__is_sort_entry(format) || perf_hpp__is_dynamic_entry(format)) + list->nr_sort_keys++; + list_add_tail(&format->sort_list, &list->sorts); } diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 480d2eb..d08e4f3 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -237,6 +237,7 @@ struct perf_hpp_fmt { struct perf_hpp_list { struct list_head fields; struct list_head sorts; + int nr_sort_keys; }; extern struct perf_hpp_list perf_hpp_list;