From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932482AbcHITTD (ORCPT ); Tue, 9 Aug 2016 15:19:03 -0400 Received: from terminus.zytor.com ([198.137.202.10]:53014 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932209AbcHITTB (ORCPT ); Tue, 9 Aug 2016 15:19:01 -0400 Date: Tue, 9 Aug 2016 12:16:52 -0700 From: tip-bot for Brendan Gregg Message-ID: Cc: alexander.shishkin@linux.intel.com, acme@redhat.com, wangnan0@huawei.com, hpa@zytor.com, mingo@kernel.org, bgregg@netflix.com, ast@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org Reply-To: peterz@infradead.org, ast@kernel.org, bgregg@netflix.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, wangnan0@huawei.com, mingo@kernel.org, hpa@zytor.com, acme@redhat.com, alexander.shishkin@linux.intel.com In-Reply-To: <1470192469-11910-4-git-send-email-bgregg@netflix.com> References: <1470192469-11910-4-git-send-email-bgregg@netflix.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf script: Add 'bpf-output' field to usage message Git-Commit-ID: bcdc09af3ef30ef071677544ce23a1c8873a2dda 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: bcdc09af3ef30ef071677544ce23a1c8873a2dda Gitweb: http://git.kernel.org/tip/bcdc09af3ef30ef071677544ce23a1c8873a2dda Author: Brendan Gregg AuthorDate: Wed, 3 Aug 2016 02:47:49 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 9 Aug 2016 10:46:43 -0300 perf script: Add 'bpf-output' field to usage message This adds the 'bpf-output' field to the perf script usage message, and docs. Signed-off-by: Brendan Gregg Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1470192469-11910-4-git-send-email-bgregg@netflix.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Documentation/perf-script.txt | 4 ++-- tools/perf/builtin-script.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt index 1f6c705..053bbbd 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt @@ -116,8 +116,8 @@ OPTIONS --fields:: Comma separated list of fields to print. Options are: comm, tid, pid, time, cpu, event, trace, ip, sym, dso, addr, symoff, - srcline, period, iregs, brstack, brstacksym, flags. - Field list can be prepended with the type, trace, sw or hw, + srcline, period, iregs, brstack, brstacksym, flags, bpf-output, + callindent. Field list can be prepended with the type, trace, sw or hw, to indicate to which event type the field list applies. e.g., -F sw:comm,tid,time,ip,sym and -F trace:time,cpu,trace diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 971ff91..9c640a8 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2116,7 +2116,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) "Valid types: hw,sw,trace,raw. " "Fields: comm,tid,pid,time,cpu,event,trace,ip,sym,dso," "addr,symoff,period,iregs,brstack,brstacksym,flags," - "callindent", parse_output_fields), + "bpf-output,callindent", parse_output_fields), OPT_BOOLEAN('a', "all-cpus", &system_wide, "system-wide collection from all CPUs"), OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",