From: tip-bot for Yunlong Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: wangnan0@huawei.com, linux-kernel@vger.kernel.org,
mingo@kernel.org, a.p.zijlstra@chello.nl, hpa@zytor.com,
yunlong.song@huawei.com, tglx@linutronix.de, acme@redhat.com,
paulus@samba.org
Subject: [tip:perf/core] perf tools: Remove the '--(null)' long_name for --list-opts
Date: Sat, 28 Feb 2015 01:33:46 -0800 [thread overview]
Message-ID: <tip-3ef1e65c829c86ffaa94a4ed59fed5da37f9610a@git.kernel.org> (raw)
In-Reply-To: <1425032491-20224-7-git-send-email-yunlong.song@huawei.com>
Commit-ID: 3ef1e65c829c86ffaa94a4ed59fed5da37f9610a
Gitweb: http://git.kernel.org/tip/3ef1e65c829c86ffaa94a4ed59fed5da37f9610a
Author: Yunlong Song <yunlong.song@huawei.com>
AuthorDate: Fri, 27 Feb 2015 18:21:30 +0800
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 27 Feb 2015 15:52:14 -0300
perf tools: Remove the '--(null)' long_name for --list-opts
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>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1425032491-20224-7-git-send-email-yunlong.song@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.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 b0ef2d8..1457d66 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++;
}
putchar('\n');
next prev parent reply other threads:[~2015-02-28 9:34 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 10:21 [PATCH v3 0/7] perf core: Make some improvements and fixes Yunlong Song
2015-02-27 10:21 ` [PATCH v3 1/7] perf list: Sort the output of 'perf list' to view more clearly Yunlong Song
2015-02-27 13:57 ` Arnaldo Carvalho de Melo
2015-02-28 9:32 ` [tip:perf/core] " tip-bot for Yunlong Song
2015-02-27 10:21 ` [PATCH v3 2/7] perf list: Fix some inaccuracy problem when parsing the argument Yunlong Song
2015-02-28 9:33 ` [tip:perf/core] perf list: Allow listing events with 'tracepoint' prefix tip-bot for Yunlong Song
2015-02-27 10:21 ` [PATCH v3 3/7] perf list: Clean up the printing functions of hardware/software events Yunlong Song
2015-02-28 9:34 ` [tip:perf/core] " tip-bot for Yunlong Song
2015-02-27 10:21 ` [PATCH v3 4/7] perf list: Extend raw-dump to certain kind of events Yunlong Song
2015-02-27 15:20 ` Arnaldo Carvalho de Melo
2015-02-27 15:23 ` Arnaldo Carvalho de Melo
2015-02-28 9:34 ` [tip:perf/core] " tip-bot for Yunlong Song
2015-02-27 10:21 ` [PATCH v3 5/7] perf list: Avoid confusion of perf output and the next command prompt Yunlong Song
2015-02-28 9:33 ` [tip:perf/core] " tip-bot for Yunlong Song
2015-02-27 10:21 ` [PATCH v3 6/7] perf record: Remove the '--(null)' long_name for --list-opts Yunlong Song
2015-02-28 9:33 ` tip-bot for Yunlong Song [this message]
2015-02-27 10:21 ` [PATCH v3 7/7] perf core: Fix the bash completion problem of 'perf --*' Yunlong Song
2015-02-28 9:34 ` [tip:perf/core] perf tools: Fix the bash completion problem of ' perf --*' tip-bot for Yunlong Song
2015-02-27 15:27 ` [PATCH v3 0/7] perf core: Make some improvements and fixes Arnaldo Carvalho de Melo
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=tip-3ef1e65c829c86ffaa94a4ed59fed5da37f9610a@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paulus@samba.org \
--cc=tglx@linutronix.de \
--cc=wangnan0@huawei.com \
--cc=yunlong.song@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.