From: Jiri Olsa <jolsa@redhat.com>
To: a.p.zijlstra@chello.nl, paulus@samba.org, mingo@elte.hu
Cc: linux-kernel@vger.kernel.org, phan@redhat.com,
Jiri Olsa <jolsa@redhat.com>
Subject: [PATCH 2/2] perf,top: dont let events to eat up whole header line
Date: Mon, 7 Mar 2011 21:13:41 +0100 [thread overview]
Message-ID: <1299528821-17521-3-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1299528821-17521-1-git-send-email-jolsa@redhat.com>
Passing multiple events might force out information about pid/tid/cpu.
Attached patch leaves 30 characters for this info at the expense of
the events' names.
wbr,
jirka
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/util/top.c | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/top.c b/tools/perf/util/top.c
index 4f869da..75cfe4d 100644
--- a/tools/perf/util/top.c
+++ b/tools/perf/util/top.c
@@ -115,9 +115,23 @@ size_t perf_top__header_snprintf(struct perf_top *top, char *bf, size_t size)
if (!top->display_weighted) {
ret += SNPRINTF(bf + ret, size - ret, "%s",
event_name(top->sym_evsel));
- } else list_for_each_entry(counter, &top->evlist->entries, node) {
- ret += SNPRINTF(bf + ret, size - ret, "%s%s",
- counter->idx ? "/" : "", event_name(counter));
+ } else {
+ /*
+ * Don't let events eat all the space. Leaving 30 bytes
+ * for the rest should be enough.
+ */
+ size_t last_pos = size - 30;
+
+ list_for_each_entry(counter, &top->evlist->entries, node) {
+ ret += SNPRINTF(bf + ret, size - ret, "%s%s",
+ counter->idx ? "/" : "",
+ event_name(counter));
+ if (ret > last_pos) {
+ sprintf(bf + last_pos - 3, "..");
+ ret = last_pos - 1;
+ break;
+ }
+ }
}
ret += SNPRINTF(bf + ret, size - ret, "], ");
--
1.7.4
next prev parent reply other threads:[~2011-03-07 20:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-07 20:13 [PATCH 0/2] perf: fix events overflow in top command Jiri Olsa
2011-03-07 20:13 ` [PATCH 1/2] perf,top: " Jiri Olsa
2011-03-09 13:59 ` Arnaldo Carvalho de Melo
2011-03-09 14:06 ` Arnaldo Carvalho de Melo
2011-03-09 14:19 ` Jiri Olsa
2011-03-09 14:25 ` Arnaldo Carvalho de Melo
2011-03-11 9:46 ` [tip:perf/core] perf top: Fix " tip-bot for Jiri Olsa
2011-03-07 20:13 ` Jiri Olsa [this message]
2011-03-11 9:47 ` [tip:perf/core] perf top: Don't let events to eat up whole header line tip-bot for Jiri Olsa
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=1299528821-17521-3-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
--cc=phan@redhat.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
all inboxes | Powered by JetHome®