Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753143AbbB1Jdu (ORCPT ); Sat, 28 Feb 2015 04:33:50 -0500 Received: from terminus.zytor.com ([198.137.202.10]:45086 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753103AbbB1Jdr (ORCPT ); Sat, 28 Feb 2015 04:33:47 -0500 Date: Sat, 28 Feb 2015 01:33:29 -0800 From: tip-bot for Yunlong Song Message-ID: Cc: hpa@zytor.com, mingo@kernel.org, paulus@samba.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, wangnan0@huawei.com, acme@redhat.com, yunlong.song@huawei.com, a.p.zijlstra@chello.nl Reply-To: yunlong.song@huawei.com, acme@redhat.com, a.p.zijlstra@chello.nl, tglx@linutronix.de, wangnan0@huawei.com, linux-kernel@vger.kernel.org, paulus@samba.org, mingo@kernel.org, hpa@zytor.com In-Reply-To: <1425032491-20224-6-git-send-email-yunlong.song@huawei.com> References: <1425032491-20224-6-git-send-email-yunlong.song@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf list: Avoid confusion of perf output and the next command prompt Git-Commit-ID: ed45752061be11a40f57df4304296147dbda2da9 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2514 Lines: 74 Commit-ID: ed45752061be11a40f57df4304296147dbda2da9 Gitweb: http://git.kernel.org/tip/ed45752061be11a40f57df4304296147dbda2da9 Author: Yunlong Song AuthorDate: Fri, 27 Feb 2015 18:21:29 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 27 Feb 2015 15:52:09 -0300 perf list: Avoid confusion of perf output and the next command prompt Distinguish the output of 'perf list --list-opts' or 'perf --list-cmds' with the next command prompt, which also happens in other cases (e.g. record, report ...). Example: Before this patch: $perf list --list-opts --raw-dump $ <-- the output and the next command prompt are at the same line After this patch: $perf list --list-opts --raw-dump $ <-- the new line Signed-off-by: Yunlong Song Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1425032491-20224-6-git-send-email-yunlong.song@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf.c | 1 + tools/perf/util/parse-options.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index f3c66b8..3df2665 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -223,6 +223,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) struct cmd_struct *p = commands+i; printf("%s ", p->cmd); } + putchar('\n'); exit(0); } else if (!strcmp(cmd, "--debug")) { if (*argc < 2) { diff --git a/tools/perf/util/parse-options.c b/tools/perf/util/parse-options.c index 4ee9a86..b0ef2d8 100644 --- a/tools/perf/util/parse-options.c +++ b/tools/perf/util/parse-options.c @@ -508,12 +508,14 @@ int parse_options_subcommand(int argc, const char **argv, const struct option *o printf("--%s ", options->long_name); options++; } + putchar('\n'); exit(130); case PARSE_OPT_LIST_SUBCMDS: if (subcommands) { for (int i = 0; subcommands[i]; i++) printf("%s ", subcommands[i]); } + putchar('\n'); exit(130); default: /* PARSE_OPT_UNKNOWN */ if (ctx.argv[0][1] == '-') { -- 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/