From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1034210AbcJ1Rpd (ORCPT ); Fri, 28 Oct 2016 13:45:33 -0400 Received: from terminus.zytor.com ([198.137.202.10]:32900 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1034123AbcJ1Rpa (ORCPT ); Fri, 28 Oct 2016 13:45:30 -0400 Date: Fri, 28 Oct 2016 10:45:12 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: jpoimboe@redhat.com, a.p.zijlstra@chello.nl, namhyung@kernel.org, hpa@zytor.com, dsahern@gmail.com, jolsa@kernel.org, mingo@kernel.org, andi@firstfloor.org, tglx@linutronix.de, acme@redhat.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, jpoimboe@redhat.com, dsahern@gmail.com, tglx@linutronix.de, andi@firstfloor.org, mingo@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com, acme@redhat.com In-Reply-To: <20161024030003.28534-2-namhyung@kernel.org> References: <20161024030003.28534-2-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf sched: Make common options cascading Git-Commit-ID: 77f02f44460ab1480af2ae6145a1a85b9fe0b8ac 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: 77f02f44460ab1480af2ae6145a1a85b9fe0b8ac Gitweb: http://git.kernel.org/tip/77f02f44460ab1480af2ae6145a1a85b9fe0b8ac Author: Namhyung Kim AuthorDate: Mon, 24 Oct 2016 12:00:03 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 25 Oct 2016 10:24:48 -0300 perf sched: Make common options cascading The -i and -v options can be used in subcommands so enable cascading the sched_options. This fixes the following inconvenience in 'perf sched': $ perf sched -i perf.data.sched map ... (it works well) ... $ perf sched map -i perf.data.sched Error: unknown switch `i' Usage: perf sched map [] --color-cpus highlight given CPUs in map --color-pids highlight given pids in map --compact map output in compact mode --cpus display given CPUs in map With this patch, the second command line works with the perf.data.sched data file. Signed-off-by: Namhyung Kim Tested-by: Arnaldo Carvalho de Melo Acked-by: Jiri Olsa Cc: Andi Kleen Cc: David Ahern Cc: Josh Poimboeuf Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/20161024030003.28534-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-sched.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index f5503ca..8ca1b540 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -1954,6 +1954,15 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) .next_shortname2 = '0', .skip_merge = 0, }; + const struct option sched_options[] = { + OPT_STRING('i', "input", &input_name, "file", + "input file name"), + OPT_INCR('v', "verbose", &verbose, + "be more verbose (show symbol address, etc)"), + OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, + "dump raw trace in ASCII"), + OPT_END() + }; const struct option latency_options[] = { OPT_STRING('s', "sort", &sched.sort_order, "key[,key2...]", "sort by key(s): runtime, switch, avg, max"), @@ -1965,7 +1974,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) "dump raw trace in ASCII"), OPT_BOOLEAN('p', "pids", &sched.skip_merge, "latency stats per pid instead of per comm"), - OPT_END() + OPT_PARENT(sched_options) }; const struct option replay_options[] = { OPT_UINTEGER('r', "repeat", &sched.replay_repeat, @@ -1975,16 +1984,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, "dump raw trace in ASCII"), OPT_BOOLEAN('f', "force", &sched.force, "don't complain, do it"), - OPT_END() - }; - const struct option sched_options[] = { - OPT_STRING('i', "input", &input_name, "file", - "input file name"), - OPT_INCR('v', "verbose", &verbose, - "be more verbose (show symbol address, etc)"), - OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, - "dump raw trace in ASCII"), - OPT_END() + OPT_PARENT(sched_options) }; const struct option map_options[] = { OPT_BOOLEAN(0, "compact", &sched.map.comp, @@ -1995,7 +1995,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) "highlight given CPUs in map"), OPT_STRING(0, "cpus", &sched.map.cpus_str, "cpus", "display given CPUs in map"), - OPT_END() + OPT_PARENT(sched_options) }; const char * const latency_usage[] = { "perf sched latency []",