Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753331AbbBRR4Q (ORCPT ); Wed, 18 Feb 2015 12:56:16 -0500 Received: from mail-wi0-f180.google.com ([209.85.212.180]:32833 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753140AbbBRR4P (ORCPT ); Wed, 18 Feb 2015 12:56:15 -0500 Date: Wed, 18 Feb 2015 18:56:10 +0100 From: Ingo Molnar To: Yunlong Song Cc: a.p.zijlstra@chello.nl, paulus@samba.org, mingo@redhat.com, acme@kernel.org, linux-kernel@vger.kernel.org, wangnan0@huawei.com Subject: Re: [PATCH] perf record: Remove the '--(null)' long_name for --list-opts Message-ID: <20150218175610.GA31995@gmail.com> References: <1424087904-3246-1-git-send-email-yunlong.song@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1424087904-3246-1-git-send-email-yunlong.song@huawei.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2623 Lines: 70 * Yunlong Song 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 > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/