From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753403AbcD0Pa7 (ORCPT ); Wed, 27 Apr 2016 11:30:59 -0400 Received: from terminus.zytor.com ([198.137.202.10]:50744 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753250AbcD0Pa4 (ORCPT ); Wed, 27 Apr 2016 11:30:56 -0400 Date: Wed, 27 Apr 2016 08:30:29 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: milian.wolff@kdab.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, adrian.hunter@intel.com, wangnan0@huawei.com, dsahern@gmail.com, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, acme@redhat.com Reply-To: namhyung@kernel.org, tglx@linutronix.de, dsahern@gmail.com, acme@redhat.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, milian.wolff@kdab.com, wangnan0@huawei.com, adrian.hunter@intel.com, mingo@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Make --event honour --min-stack too Git-Commit-ID: 7ad356159542e1f0dd4703ff3604f67390657f57 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: 7ad356159542e1f0dd4703ff3604f67390657f57 Gitweb: http://git.kernel.org/tip/7ad356159542e1f0dd4703ff3604f67390657f57 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 20 Apr 2016 19:55:48 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 25 Apr 2016 12:49:17 -0300 perf trace: Make --event honour --min-stack too Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-shj0fazntmskhjild5i6x73l@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index d1bbcb9..fc276d7 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2126,6 +2126,17 @@ static int trace__event_handler(struct trace *trace, struct perf_evsel *evsel, union perf_event *event __maybe_unused, struct perf_sample *sample) { + int callchain_ret = 0; + + if (sample->callchain) { + callchain_ret = trace__resolve_callchain(trace, evsel, sample, &callchain_cursor); + if (callchain_ret == 0) { + if (callchain_cursor.nr < trace->min_stack) + goto out; + callchain_ret = 1; + } + } + trace__printf_interrupted_entry(trace, sample); trace__fprintf_tstamp(trace, sample->time, trace->output); @@ -2144,11 +2155,11 @@ static int trace__event_handler(struct trace *trace, struct perf_evsel *evsel, fprintf(trace->output, ")\n"); - if (sample->callchain) { - if (trace__resolve_callchain(trace, evsel, sample, &callchain_cursor) == 0) - trace__fprintf_callchain(trace, sample); - } - + if (callchain_ret > 0) + trace__fprintf_callchain(trace, sample); + else if (callchain_ret < 0) + pr_err("Problem processing %s callchain, skipping...\n", perf_evsel__name(evsel)); +out: return 0; }