From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759462AbcBYCEL (ORCPT ); Wed, 24 Feb 2016 21:04:11 -0500 Received: from casper.infradead.org ([85.118.1.10]:46051 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756834AbcBYB6k (ORCPT ); Wed, 24 Feb 2016 20:58:40 -0500 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Namhyung Kim , Andi Kleen , David Ahern , Jiri Olsa , Peter Zijlstra , Stephane Eranian , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 14/31] perf tools: Add helper functions for some sort keys Date: Wed, 24 Feb 2016 22:58:09 -0300 Message-Id: <1456365506-5492-15-git-send-email-acme@kernel.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1456365506-5492-1-git-send-email-acme@kernel.org> References: <1456365506-5492-1-git-send-email-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Namhyung Kim 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 97baa1d6ae5f..044419b3be7c 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 4175b2944ff9..358035c2c327 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; -- 2.5.0