From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759731AbcBYHll (ORCPT ); Thu, 25 Feb 2016 02:41:41 -0500 Received: from torg.zytor.com ([198.137.202.12]:57286 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751066AbcBYHlk (ORCPT ); Thu, 25 Feb 2016 02:41:40 -0500 Date: Wed, 24 Feb 2016 23:40:46 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: eranian@google.com, mingo@kernel.org, hpa@zytor.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, tglx@linutronix.de, namhyung@kernel.org, peterz@infradead.org, andi@firstfloor.org, dsahern@gmail.com, acme@redhat.com Reply-To: jolsa@kernel.org, hpa@zytor.com, mingo@kernel.org, eranian@google.com, acme@redhat.com, dsahern@gmail.com, andi@firstfloor.org, namhyung@kernel.org, peterz@infradead.org, tglx@linutronix.de, wangnan0@huawei.com, linux-kernel@vger.kernel.org In-Reply-To: <1456326830-30456-2-git-send-email-namhyung@kernel.org> References: <1456326830-30456-2-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Add helper functions for some sort keys Git-Commit-ID: a9c6e46c04ba38925e94c4c2fa9217460338db43 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: a9c6e46c04ba38925e94c4c2fa9217460338db43 Gitweb: http://git.kernel.org/tip/a9c6e46c04ba38925e94c4c2fa9217460338db43 Author: Namhyung Kim AuthorDate: Thu, 25 Feb 2016 00:13:33 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 24 Feb 2016 13:05:04 -0300 perf tools: Add helper functions for some sort keys The 'trace', 'srcline' and 'srcfile' sort keys updates hist entry's field later. With the hierarchy mode, those fields are passed to a matching entry so it needs to identify the sort keys. 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-2-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/hist.h | 3 +++ tools/perf/util/sort.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 97baa1d..044419b3 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -301,6 +301,9 @@ void perf_hpp__append_sort_keys(struct perf_hpp_list *list); bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format); bool perf_hpp__is_dynamic_entry(struct perf_hpp_fmt *format); bool perf_hpp__defined_dynamic_entry(struct perf_hpp_fmt *fmt, struct hists *hists); +bool perf_hpp__is_trace_entry(struct perf_hpp_fmt *fmt); +bool perf_hpp__is_srcline_entry(struct perf_hpp_fmt *fmt); +bool perf_hpp__is_srcfile_entry(struct perf_hpp_fmt *fmt); static inline bool perf_hpp__should_skip(struct perf_hpp_fmt *format, struct hists *hists) diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 4175b29..358035c 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1391,6 +1391,39 @@ bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format) return format->header == __sort__hpp_header; } +bool perf_hpp__is_trace_entry(struct perf_hpp_fmt *fmt) +{ + struct hpp_sort_entry *hse; + + if (!perf_hpp__is_sort_entry(fmt)) + return false; + + hse = container_of(fmt, struct hpp_sort_entry, hpp); + return hse->se == &sort_trace; +} + +bool perf_hpp__is_srcline_entry(struct perf_hpp_fmt *fmt) +{ + struct hpp_sort_entry *hse; + + if (!perf_hpp__is_sort_entry(fmt)) + return false; + + hse = container_of(fmt, struct hpp_sort_entry, hpp); + return hse->se == &sort_srcline; +} + +bool perf_hpp__is_srcfile_entry(struct perf_hpp_fmt *fmt) +{ + struct hpp_sort_entry *hse; + + if (!perf_hpp__is_sort_entry(fmt)) + return false; + + hse = container_of(fmt, struct hpp_sort_entry, hpp); + return hse->se == &sort_srcfile; +} + static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b) { struct hpp_sort_entry *hse_a;