From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932871AbcLGS1J (ORCPT ); Wed, 7 Dec 2016 13:27:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:53766 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932226AbcLGS1I (ORCPT ); Wed, 7 Dec 2016 13:27:08 -0500 Date: Wed, 7 Dec 2016 10:24:36 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: jolsa@kernel.org, acme@redhat.com, tglx@linutronix.de, dsahern@gmail.com, andi@firstfloor.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, minchan@kernel.org, mingo@kernel.org Reply-To: linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org, minchan@kernel.org, mingo@kernel.org, jolsa@kernel.org, andi@firstfloor.org, namhyung@kernel.org, dsahern@gmail.com, tglx@linutronix.de, acme@redhat.com In-Reply-To: <20161206034010.6499-2-namhyung@kernel.org> References: <20161206034010.6499-2-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf sched: Cleanup option processing Git-Commit-ID: 6fa94258ce2673adc707b2ec5668464f2cf83ed3 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: 6fa94258ce2673adc707b2ec5668464f2cf83ed3 Gitweb: http://git.kernel.org/tip/6fa94258ce2673adc707b2ec5668464f2cf83ed3 Author: Namhyung Kim AuthorDate: Tue, 6 Dec 2016 12:40:01 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 7 Dec 2016 12:00:33 -0300 perf sched: Cleanup option processing The -D/--dump-raw-trace option is in the parent option so no need to repeat it. Also move -f/--force option to parent as it's common to handle data file. Signed-off-by: Namhyung Kim Acked-by: David Ahern Cc: Andi Kleen Cc: Jiri Olsa Cc: Minchan Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20161206034010.6499-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-sched.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 84c39f1..634d8cf 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c @@ -2583,6 +2583,7 @@ static int perf_sched__timehist(struct perf_sched *sched) struct perf_data_file file = { .path = input_name, .mode = PERF_DATA_MODE_READ, + .force = sched->force, }; struct perf_session *session; @@ -2988,6 +2989,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) "be more verbose (show symbol address, etc)"), 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 latency_options[] = { @@ -2995,8 +2997,6 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) "sort by key(s): runtime, switch, avg, max"), OPT_INTEGER('C', "CPU", &sched.profile_cpu, "CPU to profile on"), - OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, - "dump raw trace in ASCII"), OPT_BOOLEAN('p', "pids", &sched.skip_merge, "latency stats per pid instead of per comm"), OPT_PARENT(sched_options) @@ -3004,9 +3004,6 @@ int cmd_sched(int argc, const char **argv, const char *prefix __maybe_unused) const struct option replay_options[] = { OPT_UINTEGER('r', "repeat", &sched.replay_repeat, "repeat the workload replay N times (-1: infinite)"), - 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_PARENT(sched_options) }; const struct option map_options[] = {