Path: csiph.com!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod From: Arnaldo Carvalho de Melo Newsgroups: linux.kernel Subject: [PATCH 01/11] perf lock: Subcommands should include common options Date: Tue, 21 Mar 2017 02:20:02 +0100 Message-ID: References: X-Original-To: Ingo Molnar Dkim-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=XHidE8T+HyRBRVhx9TIiChuFhF9PjHRtn+WTcTCND5A=; b=Q6A8Z4Lrc7I1LeAnkOwaaaP4Q 6T3gt0CW9o2RWBgPYQ03qpfqaTCWc9YUalkBnaj+9FrMECoNFrC+0VpNVNZZVs/iCQ0KhF1VgcZfU 0tAkCYcL1cX9xyAZaoLj/uoRyblAk3ID7plOEWU+gQ6j6fqHB+TtPVwSdUy2rG5BYAtiqI6vUSBFY xrrt0oy/HhA0pzYoJ7FJPe/nA+1ScDDmONwcwfD5uXu8s4vtYbuP8tmA1GQB0yPN7JNOlQuwV1O9F wbdAqVogtI+JLaH4i25dxCMJfGLy4eSnqydQYuDpsUvGGvCkAjPePCm/7VX1LHscCyY3OcvJiY3dv 1BF7BJ7rQ==; X-Mailer: git-send-email 2.9.3 X-Srs-Rewrite: SMTP reverse-path rewritten from by merlin.infradead.org. See http://www.infradead.org/rpr.html Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 66 Organization: linux.* mail to news gateway X-Original-Cc: linux-kernel@vger.kernel.org, Changbin Du , Peter Zijlstra , Arnaldo Carvalho de Melo X-Original-Date: Mon, 20 Mar 2017 22:16:31 -0300 X-Original-Message-ID: <20170321011641.25763-2-acme@kernel.org> X-Original-References: <20170321011641.25763-1-acme@kernel.org> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1605238 From: Changbin Du When I use -i option for report subcommand, it doesn't accept it. We need add common options using OPT_PARENT macro. perf lock report -i lock_perf.data Error: unknown switch `i' Usage: perf lock report [] -f, --force don't complain, do it -k, --key key for sorting ... Signed-off-by: Changbin Du Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/20170317055342.8284-1-changbin.du@intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-lock.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index d750ccaa978f..4ce815bb360d 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -948,27 +948,30 @@ static int __cmd_record(int argc, const char **argv) int cmd_lock(int argc, const char **argv, const char *prefix __maybe_unused) { + const struct option lock_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 info_options[] = { OPT_BOOLEAN('t', "threads", &info_threads, "dump thread list in perf.data"), OPT_BOOLEAN('m', "map", &info_map, "map of lock instances (address:name table)"), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), - OPT_END() - }; - const struct option lock_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(lock_options) }; + const struct option report_options[] = { OPT_STRING('k', "key", &sort_key, "acquired", "key for sorting (acquired / contended / avg_wait / wait_total / wait_max / wait_min)"), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), /* TODO: type */ - OPT_END() + OPT_PARENT(lock_options) }; + const char * const info_usage[] = { "perf lock info []", NULL -- 2.9.3