From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754663AbbHFHBn (ORCPT ); Thu, 6 Aug 2015 03:01:43 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55896 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752978AbbHFHBm (ORCPT ); Thu, 6 Aug 2015 03:01:42 -0400 Date: Thu, 6 Aug 2015 00:01:22 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: jolsa@redhat.com, hpa@zytor.com, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, fweisbec@gmail.com, bp@suse.de, eranian@google.com, mail@milianw.de, adrian.hunter@intel.com, namhyung@kernel.org, dsahern@gmail.com, mingo@kernel.org Reply-To: acme@redhat.com, jolsa@redhat.com, hpa@zytor.com, mail@milianw.de, eranian@google.com, bp@suse.de, linux-kernel@vger.kernel.org, fweisbec@gmail.com, tglx@linutronix.de, mingo@kernel.org, dsahern@gmail.com, adrian.hunter@intel.com, namhyung@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Remember if the vfs_getname tracepoint/kprobe is in place Git-Commit-ID: 08c987763ad3bc1aef133bcac073198ff86efa85 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: 08c987763ad3bc1aef133bcac073198ff86efa85 Gitweb: http://git.kernel.org/tip/08c987763ad3bc1aef133bcac073198ff86efa85 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 4 Aug 2015 17:01:04 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 5 Aug 2015 10:52:32 -0300 perf trace: Remember if the vfs_getname tracepoint/kprobe is in place So that we can later decide if we will store where to expand the pathname once we are handling vfs_getname or if we should instead just go on and straight away print the pointer. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Milian Wolff Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-ytxk5s5jpc50wahffmlxgxuw@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-trace.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 3cfca93..aa1e288 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -1312,6 +1312,7 @@ struct trace { bool show_tool_stats; bool trace_syscalls; bool force; + bool vfs_getname; int trace_pgfaults; }; @@ -2188,19 +2189,20 @@ static int trace__record(struct trace *trace, int argc, const char **argv) static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp); -static void perf_evlist__add_vfs_getname(struct perf_evlist *evlist) +static bool perf_evlist__add_vfs_getname(struct perf_evlist *evlist) { struct perf_evsel *evsel = perf_evsel__newtp("probe", "vfs_getname"); if (evsel == NULL) - return; + return false; if (perf_evsel__field(evsel, "pathname") == NULL) { perf_evsel__delete(evsel); - return; + return false; } evsel->handler = trace__vfs_getname; perf_evlist__add(evlist, evsel); + return true; } static int perf_evlist__add_pgfault(struct perf_evlist *evlist, @@ -2330,7 +2332,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) goto out_error_raw_syscalls; if (trace->trace_syscalls) - perf_evlist__add_vfs_getname(evlist); + trace->vfs_getname = perf_evlist__add_vfs_getname(evlist); if ((trace->trace_pgfaults & TRACE_PFMAJ) && perf_evlist__add_pgfault(evlist, PERF_COUNT_SW_PAGE_FAULTS_MAJ)) {