From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932864AbbEFDHt (ORCPT ); Tue, 5 May 2015 23:07:49 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36015 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932810AbbEFDHo (ORCPT ); Tue, 5 May 2015 23:07:44 -0400 Date: Tue, 5 May 2015 20:07:29 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dzickus@redhat.com, dsahern@gmail.com, jolsa@redhat.com, namhyung@kernel.org, mingo@kernel.org, acme@redhat.com, bp@suse.de, fweisbec@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, eranian@google.com, tglx@linutronix.de Reply-To: jolsa@redhat.com, dsahern@gmail.com, dzickus@redhat.com, acme@redhat.com, mingo@kernel.org, namhyung@kernel.org, hpa@zytor.com, fweisbec@gmail.com, bp@suse.de, tglx@linutronix.de, eranian@google.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf trace: Clarify that -e is about syscalls, not perf events in general Git-Commit-ID: d303e85a5c19eb8d913951d1aa81556fc20b20af 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: d303e85a5c19eb8d913951d1aa81556fc20b20af Gitweb: http://git.kernel.org/tip/d303e85a5c19eb8d913951d1aa81556fc20b20af Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 23 Apr 2015 12:02:07 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Apr 2015 10:38:04 -0300 perf trace: Clarify that -e is about syscalls, not perf events in general This comes from the desire of having -e/--expr to have the same meaning as for 'strace', while other perf tools use it for --event, which 'trace' honours, i.e. all perf tools have --event in common, but trace uses -e for strace's --expr. Clarify it in the --help output. Reported-by: David Ahern Cc: Adrian Hunter Cc: Borislav Petkov Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-5j94bcsdmcbeu2xthnzsj60d@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-trace.txt | 2 +- tools/perf/builtin-trace.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/perf/Documentation/perf-trace.txt b/tools/perf/Documentation/perf-trace.txt index ba03fd5..1db9c8b 100644 --- a/tools/perf/Documentation/perf-trace.txt +++ b/tools/perf/Documentation/perf-trace.txt @@ -35,7 +35,7 @@ OPTIONS -e:: --expr:: - List of events to show, currently only syscall names. + List of syscalls to show, currently only syscall names. Prefixing with ! shows all syscalls but the ones specified. You may need to escape it. diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 23fb081..d1139b6 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -2660,8 +2660,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) OPT_BOOLEAN(0, "comm", &trace.show_comm, "show the thread COMM next to its id"), OPT_BOOLEAN(0, "tool_stats", &trace.show_tool_stats, "show tool stats"), - OPT_STRING('e', "expr", &ev_qualifier_str, "expr", - "list of events to trace"), + OPT_STRING('e', "expr", &ev_qualifier_str, "expr", "list of syscalls to trace"), OPT_STRING('o', "output", &output_name, "file", "output file name"), OPT_STRING('i', "input", &input_name, "file", "Analyze events in file"), OPT_STRING('p', "pid", &trace.opts.target.pid, "pid",