From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755284AbcKYRTk (ORCPT ); Fri, 25 Nov 2016 12:19:40 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49748 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753474AbcKYRTc (ORCPT ); Fri, 25 Nov 2016 12:19:32 -0500 Date: Fri, 25 Nov 2016 09:19:04 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, a.p.zijlstra@chello.nl, andi@firstfloor.org, jolsa@kernel.org, dsahern@gmail.com, eranian@google.com, namhyung@kernel.org Reply-To: dsahern@gmail.com, jolsa@kernel.org, andi@firstfloor.org, a.p.zijlstra@chello.nl, namhyung@kernel.org, eranian@google.com, hpa@zytor.com, linux-kernel@vger.kernel.org, acme@redhat.com, tglx@linutronix.de, mingo@kernel.org In-Reply-To: <20161124011114.7102-2-namhyung@kernel.org> References: <20161124011114.7102-2-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf callchain: Add option to skip ignore symbol when printing callchains Git-Commit-ID: 2d9bbf6eb3825739efa9e91c256ce7ead60d8367 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: 2d9bbf6eb3825739efa9e91c256ce7ead60d8367 Gitweb: http://git.kernel.org/tip/2d9bbf6eb3825739efa9e91c256ce7ead60d8367 Author: Namhyung Kim AuthorDate: Thu, 24 Nov 2016 10:11:13 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 25 Nov 2016 10:49:38 -0300 perf callchain: Add option to skip ignore symbol when printing callchains For tracepoint events, callchains always contain certain functions. Sometimes it'd be better to skip those functions as they have no value. Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Cc: Andi Kleen Cc: David Ahern Cc: Jiri Olsa Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/20161124011114.7102-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-sched.c | 3 ++- tools/perf/util/evsel.h | 1 + tools/perf/util/evsel_fprintf.c | 7 ++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 829468d..43fcc13 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1876,7 +1876,8 @@ static void timehist_print_sample(struct perf_sched *sched, sample__fprintf_sym(sample, al, 0, EVSEL__PRINT_SYM | EVSEL__PRINT_ONELINE | - EVSEL__PRINT_CALLCHAIN_ARROW, + EVSEL__PRINT_CALLCHAIN_ARROW | + EVSEL__PRINT_SKIP_IGNORED, &callchain_cursor, stdout); out: diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 27fa3a3..6abb89c 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -392,6 +392,7 @@ int perf_evsel__fprintf(struct perf_evsel *evsel, #define EVSEL__PRINT_SRCLINE (1<<5) #define EVSEL__PRINT_UNKNOWN_AS_ADDR (1<<6) #define EVSEL__PRINT_CALLCHAIN_ARROW (1<<7) +#define EVSEL__PRINT_SKIP_IGNORED (1<<8) struct callchain_cursor; diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c index 53bb614..5a6f522 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c @@ -109,6 +109,7 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, int print_srcline = print_opts & EVSEL__PRINT_SRCLINE; int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR; int print_arrow = print_opts & EVSEL__PRINT_CALLCHAIN_ARROW; + int print_skip_ignored = print_opts & EVSEL__PRINT_SKIP_IGNORED; char s = print_oneline ? ' ' : '\t'; bool first = true; @@ -124,6 +125,9 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, if (!node) break; + if (node->sym && node->sym->ignore && print_skip_ignored) + goto next; + printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " "); if (print_arrow && !first) @@ -162,8 +166,9 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment, if (!print_oneline) printed += fprintf(fp, "\n"); - callchain_cursor_advance(cursor); first = false; +next: + callchain_cursor_advance(cursor); } }