public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Yunlong Song <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/core] perf list: Avoid confusion of perf output and the next command prompt
Date: Sat, 28 Feb 2015 01:33:29 -0800	[thread overview]
Message-ID: <tip-ed45752061be11a40f57df4304296147dbda2da9@git.kernel.org> (raw)
In-Reply-To: <1425032491-20224-6-git-send-email-yunlong.song@huawei.com>

Commit-ID:  ed45752061be11a40f57df4304296147dbda2da9
Gitweb:     http://git.kernel.org/tip/ed45752061be11a40f57df4304296147dbda2da9
Author:     Yunlong Song <yunlong.song@huawei.com>
AuthorDate: Fri, 27 Feb 2015 18:21:29 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <yunlong.song@huawei.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-6-git-send-email-yunlong.song@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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] == '-') {

  reply	other threads:[~2015-02-28  9:33 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-bot for Yunlong Song [this message]
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:perf/core] perf tools: " tip-bot for Yunlong Song
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-ed45752061be11a40f57df4304296147dbda2da9@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox