From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFEE7C4332F for ; Wed, 1 Nov 2023 14:35:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344313AbjKAOfu (ORCPT ); Wed, 1 Nov 2023 10:35:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233968AbjKAOfs (ORCPT ); Wed, 1 Nov 2023 10:35:48 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 02D37DE; Wed, 1 Nov 2023 07:35:45 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5BB0D2F4; Wed, 1 Nov 2023 07:36:27 -0700 (PDT) Received: from [10.57.1.100] (unknown [10.57.1.100]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 224A33F64C; Wed, 1 Nov 2023 07:35:43 -0700 (PDT) Message-ID: <3ae2cf90-b0a1-5f54-56aa-ed4a04dca8b0@arm.com> Date: Wed, 1 Nov 2023 14:35:42 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 2/2] perf lock info: Enforce exactly one of --map and --thread To: Arnaldo Carvalho de Melo Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Arnaldo Carvalho de Melo References: <20231031120526.11502-1-nick.forrington@arm.com> <20231031120526.11502-3-nick.forrington@arm.com> From: Nick Forrington Content-Language: , en-GB In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 31/10/2023 15:38, Arnaldo Carvalho de Melo wrote: > Em Tue, Oct 31, 2023 at 12:05:25PM +0000, Nick Forrington escreveu: >> Improve error reporting for command line arguments. >> >> Display error/usage if neither --map or --thread are specified (rather >> than a non user-friendly error "Unknown type of information"). >> >> Display error/usage if both --map and --thread are specified (rather >> than ignoring "--map" and displaying only thread information). > Shouldn't one of them be the default so that we type less for the most > common usage? > > - Arnaldo > There isn't an obvious choice (to me) for which would be the default. Both options display completely different data/outputs, so I think it makes sense to be explicit about which data is requested. An alternative could be to use sub-commands e.g. "perf lock info threads" or just "perf lock threads", although changing the existing options would be more disruptive. Cheers, Nick >> Signed-off-by: Nick Forrington >> --- >> tools/perf/builtin-lock.c | 25 +++++++++++++++++++++++++ >> 1 file changed, 25 insertions(+) >> >> diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c >> index 3aa8ba5ad928..cf29f648d291 100644 >> --- a/tools/perf/builtin-lock.c >> +++ b/tools/perf/builtin-lock.c >> @@ -2021,6 +2021,27 @@ static int check_lock_report_options(const struct option *options, >> return 0; >> } >> >> +static int check_lock_info_options(const struct option *options, >> + const char * const *usage) >> +{ >> + if (!info_map && !info_threads) { >> + pr_err("Requires one of --map or --threads\n"); >> + parse_options_usage(usage, options, "map", 0); >> + parse_options_usage(NULL, options, "threads", 0); >> + return -1; >> + >> + } >> + >> + if (info_map && info_threads) { >> + pr_err("Cannot show map and threads together\n"); >> + parse_options_usage(usage, options, "map", 0); >> + parse_options_usage(NULL, options, "threads", 0); >> + return -1; >> + } >> + >> + return 0; >> +} >> + >> static int check_lock_contention_options(const struct option *options, >> const char * const *usage) >> >> @@ -2709,6 +2730,10 @@ int cmd_lock(int argc, const char **argv) >> if (argc) >> usage_with_options(info_usage, info_options); >> } >> + >> + if (check_lock_info_options(info_options, info_usage) < 0) >> + return -1; >> + >> /* recycling report_lock_ops */ >> trace_handler = &report_lock_ops; >> rc = __cmd_report(true); >> -- >> 2.42.0 >> >>