From: Franck Bui-Huu <vagabon.xyz@gmail.com>
To: masami.hiramatsu.pt@hitachi.com
Cc: acme@ghostprotocols.net, linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] perf-probe: rewrite show_one_line() to make it simpler
Date: Mon, 20 Dec 2010 15:18:01 +0100 [thread overview]
Message-ID: <1292854685-8230-3-git-send-email-fbuihuu@gmail.com> (raw)
In-Reply-To: <1292854685-8230-1-git-send-email-fbuihuu@gmail.com>
From: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
---
tools/perf/util/probe-event.c | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 6fa0403..5cc8f6b 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -300,28 +300,21 @@ static int get_real_path(const char *raw_path, const char *comp_dir,
static int show_one_line(FILE *fp, int l, bool skip, bool show_num)
{
char buf[LINEBUF_SIZE];
- const char *color = PERF_COLOR_BLUE;
+ const char *color = show_num ? "" : PERF_COLOR_BLUE;
+ const char *prefix = NULL;
- if (fgets(buf, LINEBUF_SIZE, fp) == NULL)
- goto error;
- if (!skip) {
- if (show_num)
- fprintf(stdout, "%7d %s", l, buf);
- else
- color_fprintf(stdout, color, " %s", buf);
- }
-
- while (strlen(buf) == LINEBUF_SIZE - 1 &&
- buf[LINEBUF_SIZE - 2] != '\n') {
+ do {
if (fgets(buf, LINEBUF_SIZE, fp) == NULL)
goto error;
- if (!skip) {
- if (show_num)
- fprintf(stdout, "%s", buf);
- else
- color_fprintf(stdout, color, "%s", buf);
+ if (skip)
+ continue;
+ if (!prefix) {
+ prefix = show_num ? "%7d " : " ";
+ fprintf(stdout, prefix, l);
}
- }
+ color_fprintf(stdout, color, "%s", buf);
+
+ } while (strchr(buf, '\n') == NULL);
return 0;
error:
--
1.7.3.2
next prev parent reply other threads:[~2010-12-20 14:18 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-20 14:17 [PATCH 0/6] Minor cleanups & fixes for perf-probe(1) Franck Bui-Huu
2010-12-20 14:18 ` [PATCH 1/6] perf-tools: make perf-probe -L display the absolute path of the dumped file Franck Bui-Huu
2010-12-21 5:30 ` Masami Hiramatsu
2010-12-22 11:30 ` [tip:perf/core] perf probe: Make " tip-bot for Franck Bui-Huu
2010-12-20 14:18 ` Franck Bui-Huu [this message]
2010-12-21 8:55 ` [PATCH 2/6] perf-probe: rewrite show_one_line() to make it simpler Masami Hiramatsu
2010-12-22 11:30 ` [tip:perf/core] perf probe: Rewrite " tip-bot for Franck Bui-Huu
2010-12-20 14:18 ` [PATCH 3/6] perf-probe: clean up redundant tests in show_line_range() Franck Bui-Huu
2010-12-21 9:47 ` Masami Hiramatsu
2010-12-22 11:31 ` [tip:perf/core] perf probe: Clean " tip-bot for Franck Bui-Huu
2010-12-20 14:18 ` [PATCH 4/6] perf-probe: Fix line range description since a single file is allowed Franck Bui-Huu
2010-12-22 11:31 ` [tip:perf/core] perf probe: " tip-bot for Franck Bui-Huu
2010-12-20 14:18 ` [PATCH 5/6] perf-probe: don't always consider EOF as an error when listing source code Franck Bui-Huu
2010-12-21 11:54 ` Masami Hiramatsu
2010-12-22 11:31 ` [tip:perf/core] perf probe: Don't " tip-bot for Franck Bui-Huu
2010-12-22 13:14 ` Franck Bui-Huu
2010-12-22 14:43 ` Arnaldo Carvalho de Melo
2010-12-22 16:37 ` Franck Bui-Huu
2010-12-25 8:58 ` [tip:perf/core] perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen tip-bot for Franck Bui-Huu
2010-12-26 14:11 ` Masami Hiramatsu
2010-12-20 14:18 ` [PATCH 6/6] perf-probe: handle gracefully some stupid and buggy line syntaxes Franck Bui-Huu
2010-12-21 13:10 ` Masami Hiramatsu
2010-12-22 11:32 ` [tip:perf/core] perf probe: Handle " tip-bot for Franck Bui-Huu
2010-12-21 13:11 ` [PATCH 0/6] Minor cleanups & fixes for perf-probe(1) Masami Hiramatsu
2010-12-21 18:01 ` Franck Bui-Huu
2010-12-21 21:05 ` Arnaldo Carvalho de Melo
2010-12-22 13:11 ` Franck Bui-Huu
2010-12-24 0:36 ` Masami Hiramatsu
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=1292854685-8230-3-git-send-email-fbuihuu@gmail.com \
--to=vagabon.xyz@gmail.com \
--cc=acme@ghostprotocols.net \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.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;
as well as URLs for NNTP newsgroup(s).