From: Ian Rogers <irogers@google.com>
To: Namhyung Kim <namhyung@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Kan Liang <kan.liang@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
linux-perf-users@vger.kernel.org
Subject: Re: [PATCH v2] tools lib subcmd: Show parent options in help
Date: Mon, 29 Apr 2024 20:36:38 -0700 [thread overview]
Message-ID: <CAP-5=fWWML91BsOfF1wvJcDFPG4=S_b3cTe_gza6GDQyWYjksA@mail.gmail.com> (raw)
In-Reply-To: <20240429233707.1511175-1-namhyung@kernel.org>
On Mon, Apr 29, 2024 at 4:37 PM Namhyung Kim <namhyung@kernel.org> wrote:
>
> I've just realized that help message in a subcommand didn't show one
> in the parent command. Since the option parser understands the parent,
> display code should do the same. For example, `perf ftrace latency -h`
> should show options in the `perf ftrace` command too.
>
> Before:
>
> $ perf ftrace latency -h
>
> Usage: perf ftrace [<options>] [<command>]
> or: perf ftrace [<options>] -- [<command>] [<options>]
> or: perf ftrace {trace|latency} [<options>] [<command>]
> or: perf ftrace {trace|latency} [<options>] -- [<command>] [<options>]
>
> -b, --use-bpf Use BPF to measure function latency
> -n, --use-nsec Use nano-second histogram
> -T, --trace-funcs <func>
> Show latency of given function
>
> After:
>
> $ perf ftrace latency -h
>
> Usage: perf ftrace [<options>] [<command>]
> or: perf ftrace [<options>] -- [<command>] [<options>]
> or: perf ftrace {trace|latency} [<options>] [<command>]
> or: perf ftrace {trace|latency} [<options>] -- [<command>] [<options>]
>
> -a, --all-cpus System-wide collection from all CPUs
> -b, --use-bpf Use BPF to measure function latency
> -C, --cpu <cpu> List of cpus to monitor
> -n, --use-nsec Use nano-second histogram
> -p, --pid <pid> Trace on existing process id
> -T, --trace-funcs <func>
> Show latency of given function
> -v, --verbose Be more verbose
> --tid <tid> Trace on existing thread id (exclusive to --pid)
>
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: Ian Rogers <irogers@google.com>
Thanks,
Ian
> ---
> *v2: remove goto and add comments (Ian)
>
> tools/lib/subcmd/parse-options.c | 36 +++++++++++++++++++++-----------
> 1 file changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/tools/lib/subcmd/parse-options.c b/tools/lib/subcmd/parse-options.c
> index 9fa75943f2ed..eb896d30545b 100644
> --- a/tools/lib/subcmd/parse-options.c
> +++ b/tools/lib/subcmd/parse-options.c
> @@ -806,18 +806,30 @@ static int option__cmp(const void *va, const void *vb)
>
> static struct option *options__order(const struct option *opts)
> {
> - int nr_opts = 0, nr_group = 0, len;
> - const struct option *o = opts;
> - struct option *opt, *ordered, *group;
> -
> - for (o = opts; o->type != OPTION_END; o++)
> - ++nr_opts;
> -
> - len = sizeof(*o) * (nr_opts + 1);
> - ordered = malloc(len);
> - if (!ordered)
> - goto out;
> - memcpy(ordered, opts, len);
> + int nr_opts = 0, nr_group = 0, nr_parent = 0, len;
> + const struct option *o, *p = opts;
> + struct option *opt, *ordered = NULL, *group;
> +
> + /* flatten the options that have parents */
> + for (p = opts; p != NULL; p = o->parent) {
> + for (o = p; o->type != OPTION_END; o++)
> + ++nr_opts;
> +
> + /*
> + * the length is given by the number of options plus a null
> + * terminator for the last loop iteration.
> + */
> + len = sizeof(*o) * (nr_opts + !o->parent);
> + group = realloc(ordered, len);
> + if (!group)
> + goto out;
> + ordered = group;
> + memcpy(&ordered[nr_parent], p, sizeof(*o) * (nr_opts - nr_parent));
> +
> + nr_parent = nr_opts;
> + }
> + /* copy the last OPTION_END */
> + memcpy(&ordered[nr_opts], o, sizeof(*o));
>
> /* sort each option group individually */
> for (opt = group = ordered; opt->type != OPTION_END; opt++) {
> --
> 2.44.0.769.g3c40516874-goog
>
prev parent reply other threads:[~2024-04-30 3:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 23:37 [PATCH v2] tools lib subcmd: Show parent options in help Namhyung Kim
2024-04-30 3:36 ` Ian Rogers [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP-5=fWWML91BsOfF1wvJcDFPG4=S_b3cTe_gza6GDQyWYjksA@mail.gmail.com' \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).