* [PATCH] perf record: Remove the '--(null)' long_name for --list-opts
@ 2015-02-16 11:58 Yunlong Song
2015-02-18 17:56 ` Ingo Molnar
0 siblings, 1 reply; 3+ messages in thread
From: Yunlong Song @ 2015-02-16 11:58 UTC (permalink / raw)
To: a.p.zijlstra, paulus, mingo, acme; +Cc: linux-kernel, wangnan0
If the long_name of a 'struct option' is defined as NULL, --list-opts
will incorrectly print '--(null)' in its output. As a result, '--(null)'
will finally appear in the case of bash completion, e.g. 'perf record --'.
Example:
Before this patch:
$ perf record --list-opts
--event --filter --pid --tid --realtime --no-buffering --raw-samples
--all-cpus --cpu --count --output --no-inherit --freq --mmap-pages
--group --(null) --call-graph --verbose --quiet --stat --data
--timestamp --period --no-samples --no-buildid-cache --no-buildid
--cgroup --delay --uid --branch-any --branch-filter --weight
--transaction --per-thread --intr-regs
After this patch:
$ perf record --list-opts
--event --filter --pid --tid --realtime --no-buffering --raw-samples
--all-cpus --cpu --count --output --no-inherit --freq --mmap-pages
--group --call-graph --verbose --quiet --stat --data --timestamp
--period --no-samples --no-buildid-cache --no-buildid --cgroup --delay
--uid --branch-any --branch-filter --weight --transaction --per-thread
--intr-regs
Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
---
tools/perf/util/parse-options.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
index 4ee9a86..2bfe0b3 100644
--- a/tools/perf/util/parse-options.c
+++ b/tools/perf/util/parse-options.c
@@ -505,7 +505,8 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
break;
case PARSE_OPT_LIST_OPTS:
while (options->type != OPTION_END) {
- printf("--%s ", options->long_name);
+ if (options->long_name)
+ printf("--%s ", options->long_name);
options++;
}
exit(130);
--
1.8.5.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] perf record: Remove the '--(null)' long_name for --list-opts
2015-02-16 11:58 [PATCH] perf record: Remove the '--(null)' long_name for --list-opts Yunlong Song
@ 2015-02-18 17:56 ` Ingo Molnar
2015-02-27 10:47 ` Yunlong Song
0 siblings, 1 reply; 3+ messages in thread
From: Ingo Molnar @ 2015-02-18 17:56 UTC (permalink / raw)
To: Yunlong Song; +Cc: a.p.zijlstra, paulus, mingo, acme, linux-kernel, wangnan0
* Yunlong Song <yunlong.song@huawei.com> wrote:
> If the long_name of a 'struct option' is defined as NULL, --list-opts
> will incorrectly print '--(null)' in its output. As a result, '--(null)'
> will finally appear in the case of bash completion, e.g. 'perf record --'.
>
> Example:
>
> Before this patch:
>
> $ perf record --list-opts
>
> --event --filter --pid --tid --realtime --no-buffering --raw-samples
> --all-cpus --cpu --count --output --no-inherit --freq --mmap-pages
> --group --(null) --call-graph --verbose --quiet --stat --data
> --timestamp --period --no-samples --no-buildid-cache --no-buildid
> --cgroup --delay --uid --branch-any --branch-filter --weight
> --transaction --per-thread --intr-regs
>
> After this patch:
>
> $ perf record --list-opts
>
> --event --filter --pid --tid --realtime --no-buffering --raw-samples
> --all-cpus --cpu --count --output --no-inherit --freq --mmap-pages
> --group --call-graph --verbose --quiet --stat --data --timestamp
> --period --no-samples --no-buildid-cache --no-buildid --cgroup --delay
> --uid --branch-any --branch-filter --weight --transaction --per-thread
> --intr-regs
>
> Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
> ---
> tools/perf/util/parse-options.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
> index 4ee9a86..2bfe0b3 100644
> --- a/tools/perf/util/parse-options.c
> +++ b/tools/perf/util/parse-options.c
> @@ -505,7 +505,8 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
> break;
> case PARSE_OPT_LIST_OPTS:
> while (options->type != OPTION_END) {
> - printf("--%s ", options->long_name);
> + if (options->long_name)
> + printf("--%s ", options->long_name);
There seems to be another 'perf record --list-opts' bug as
well:
comet:~/tip> perf record --list-opts
--event --filter --pid --tid --realtime --no-buffering
--raw-samples --all-cpus --cpu --count --output
--no-inherit --freq --mmap-pages --group --(null)
--call-graph --verbose --quiet --stat --data --timestamp
--period --no-samples --no-buildid-cache --no-buildid
--cgroup --delay --uid --branch-any --branch-filter
--weight --transaction --per-thread --intr-regs comet:~/tip>
Note the lack of newline at the end of the printout.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] perf record: Remove the '--(null)' long_name for --list-opts
2015-02-18 17:56 ` Ingo Molnar
@ 2015-02-27 10:47 ` Yunlong Song
0 siblings, 0 replies; 3+ messages in thread
From: Yunlong Song @ 2015-02-27 10:47 UTC (permalink / raw)
To: Ingo Molnar; +Cc: a.p.zijlstra, paulus, mingo, acme, linux-kernel, wangnan0
On 2015/2/19 1:56, Ingo Molnar wrote:
>
> * Yunlong Song <yunlong.song@huawei.com> wrote:
>
>> If the long_name of a 'struct option' is defined as NULL, --list-opts
>> will incorrectly print '--(null)' in its output. As a result, '--(null)'
>> will finally appear in the case of bash completion, e.g. 'perf record --'.
>>
>> Example:
>>
>> Before this patch:
>>
>> $ perf record --list-opts
>>
>> --event --filter --pid --tid --realtime --no-buffering --raw-samples
>> --all-cpus --cpu --count --output --no-inherit --freq --mmap-pages
>> --group --(null) --call-graph --verbose --quiet --stat --data
>> --timestamp --period --no-samples --no-buildid-cache --no-buildid
>> --cgroup --delay --uid --branch-any --branch-filter --weight
>> --transaction --per-thread --intr-regs
>>
>> After this patch:
>>
>> $ perf record --list-opts
>>
>> --event --filter --pid --tid --realtime --no-buffering --raw-samples
>> --all-cpus --cpu --count --output --no-inherit --freq --mmap-pages
>> --group --call-graph --verbose --quiet --stat --data --timestamp
>> --period --no-samples --no-buildid-cache --no-buildid --cgroup --delay
>> --uid --branch-any --branch-filter --weight --transaction --per-thread
>> --intr-regs
>>
>> Signed-off-by: Yunlong Song <yunlong.song@huawei.com>
>> ---
>> tools/perf/util/parse-options.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c
>> index 4ee9a86..2bfe0b3 100644
>> --- a/tools/perf/util/parse-options.c
>> +++ b/tools/perf/util/parse-options.c
>> @@ -505,7 +505,8 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o
>> break;
>> case PARSE_OPT_LIST_OPTS:
>> while (options->type != OPTION_END) {
>> - printf("--%s ", options->long_name);
>> + if (options->long_name)
>> + printf("--%s ", options->long_name);
>
> There seems to be another 'perf record --list-opts' bug as
> well:
>
> comet:~/tip> perf record --list-opts
> --event --filter --pid --tid --realtime --no-buffering
> --raw-samples --all-cpus --cpu --count --output
> --no-inherit --freq --mmap-pages --group --(null)
> --call-graph --verbose --quiet --stat --data --timestamp
> --period --no-samples --no-buildid-cache --no-buildid
> --cgroup --delay --uid --branch-any --branch-filter
> --weight --transaction --per-thread --intr-regs comet:~/tip>
>
> Note the lack of newline at the end of the printout.
>
> Thanks,
>
> Ingo
>
> .
>
I have put this patch into my new patchset, see:
http://lkml.org/lkml/2015/2/27/139 [PATCH v3 6/7],
and the new patchset has already fixed the problem of 'lack of newline
at the end of the printout', see:
http://lkml.org/lkml/2015/2/27/140 [PATCH v3 5/7]
--
Thanks,
Yunlong Song
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-02-27 10:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-16 11:58 [PATCH] perf record: Remove the '--(null)' long_name for --list-opts Yunlong Song
2015-02-18 17:56 ` Ingo Molnar
2015-02-27 10:47 ` Yunlong Song
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox