From nobody Wed Dec 17 08:13:13 2025 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 B1C65C4332F for ; Wed, 1 Nov 2023 06:48:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345408AbjKAGsG (ORCPT ); Wed, 1 Nov 2023 02:48:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231597AbjKAGsE (ORCPT ); Wed, 1 Nov 2023 02:48:04 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81F7D98; Tue, 31 Oct 2023 23:48:00 -0700 (PDT) Received: from kwepemm000003.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4SKyCB5ntszPnly; Wed, 1 Nov 2023 14:43:50 +0800 (CST) Received: from ubuntu2204.huawei.com (10.67.174.22) by kwepemm000003.china.huawei.com (7.193.23.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Wed, 1 Nov 2023 14:47:56 +0800 From: Yang Jihong To: , , , , , , , , , , CC: Subject: [PATCH v2] perf debug: List available options when no variable is specified Date: Wed, 1 Nov 2023 06:45:43 +0000 Message-ID: <20231101064543.1481957-1-yangjihong1@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.67.174.22] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm000003.china.huawei.com (7.193.23.66) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Minor help message improvement for `perf --debug` Before: # perf --debug No variable specified for --debug. Usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS] After: # perf --debug No variable specified for --debug, available options: verbose,ordered-eve= nts,stderr,data-convert,perf-event-open Usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS] Suggested-by: Arnaldo Carvalho de Melo Signed-off-by: Yang Jihong Acked-by: Arnaldo Carvalho de Melo --- Changes since v1: - Provide helper to iterate debug_opts and print name instead of adding a = new variable. tools/perf/perf.c | 6 +++++- tools/perf/util/debug.c | 13 +++++++++++++ tools/perf/util/debug.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index d3fc8090413c..f29c3ef818a3 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -279,7 +279,11 @@ static int handle_options(const char ***argv, int *arg= c, int *envchanged) exit(0); } else if (!strcmp(cmd, "--debug")) { if (*argc < 2) { - fprintf(stderr, "No variable specified for --debug.\n"); + fprintf(stderr, + "No variable specified for --debug, available options: "); + perf_debug_fprint_options(stderr); + fprintf(stderr, "\n"); + usage(perf_usage_string); } if (perf_debug_option((*argv)[1])) diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c index 88378c4c5dd9..a014e6198d41 100644 --- a/tools/perf/util/debug.c +++ b/tools/perf/util/debug.c @@ -246,6 +246,19 @@ int perf_debug_option(const char *str) return 0; } =20 +void perf_debug_fprint_options(FILE *file) +{ + struct sublevel_option *opt =3D debug_opts; + + if (!file) + return; + + while (opt->name) { + fprintf(file, "%s%s", opt =3D=3D debug_opts ? "" : ",", opt->name); + opt++; + } +} + int perf_quiet_option(void) { struct sublevel_option *opt =3D &debug_opts[0]; diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h index f99468a7f681..17294834cdb4 100644 --- a/tools/perf/util/debug.h +++ b/tools/perf/util/debug.h @@ -77,6 +77,7 @@ int eprintf_time(int level, int var, u64 t, const char *f= mt, ...) __printf(4, 5) int veprintf(int level, int var, const char *fmt, va_list args); =20 int perf_debug_option(const char *str); +void perf_debug_fprint_options(FILE *file); void debug_set_file(FILE *file); void debug_set_display_time(bool set); void perf_debug_setup(void); --=20 2.34.1