From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 3/9] perf hists: Handle field separator properly
Date: Sat, 8 Sep 2012 17:36:48 -0300 [thread overview]
Message-ID: <1347136614-25598-4-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1347136614-25598-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
When a field separator is given, the output format doesn't need to be
fancy like aligning to column length, coloring the percent value and so
on. And since there's a slight difference to normal format, fix it not
to break backward compatibility.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1346640790-17197-3-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/hist.c | 74 ++++++++++++++++++++++++++++---------------
tools/perf/ui/stdio/hist.c | 3 +-
2 files changed, 50 insertions(+), 27 deletions(-)
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index 8ccd1f2..009adf2 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -8,10 +8,9 @@
/* hist period print (hpp) functions */
static int hpp__header_overhead(struct perf_hpp *hpp)
{
- if (hpp->ptr)
- return scnprintf(hpp->buf, hpp->size, "Baseline");
- else
- return scnprintf(hpp->buf, hpp->size, "Overhead");
+ const char *fmt = hpp->ptr ? "Baseline" : "Overhead";
+
+ return scnprintf(hpp->buf, hpp->size, fmt);
}
static int hpp__width_overhead(struct perf_hpp *hpp __used)
@@ -40,6 +39,7 @@ static int hpp__color_overhead(struct perf_hpp *hpp, struct hist_entry *he)
static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)
{
double percent = 100.0 * he->period / hpp->total_period;
+ const char *fmt = symbol_conf.field_sep ? "%.2f" : " %5.2f%%";
if (hpp->ptr) {
struct hists *old_hists = hpp->ptr;
@@ -52,12 +52,14 @@ static int hpp__entry_overhead(struct perf_hpp *hpp, struct hist_entry *he)
percent = 0.0;
}
- return scnprintf(hpp->buf, hpp->size, " %5.2f%%", percent);
+ return scnprintf(hpp->buf, hpp->size, fmt, percent);
}
static int hpp__header_overhead_sys(struct perf_hpp *hpp)
{
- return scnprintf(hpp->buf, hpp->size, " sys ");
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%6s";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, "sys");
}
static int hpp__width_overhead_sys(struct perf_hpp *hpp __used)
@@ -74,12 +76,16 @@ static int hpp__color_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
static int hpp__entry_overhead_sys(struct perf_hpp *hpp, struct hist_entry *he)
{
double percent = 100.0 * he->period_sys / hpp->total_period;
- return scnprintf(hpp->buf, hpp->size, "%5.2f%%", percent);
+ const char *fmt = symbol_conf.field_sep ? "%.2f" : "%5.2f%%";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, percent);
}
static int hpp__header_overhead_us(struct perf_hpp *hpp)
{
- return scnprintf(hpp->buf, hpp->size, " user ");
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%6s";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, "user");
}
static int hpp__width_overhead_us(struct perf_hpp *hpp __used)
@@ -96,7 +102,9 @@ static int hpp__color_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
static int hpp__entry_overhead_us(struct perf_hpp *hpp, struct hist_entry *he)
{
double percent = 100.0 * he->period_us / hpp->total_period;
- return scnprintf(hpp->buf, hpp->size, "%5.2f%%", percent);
+ const char *fmt = symbol_conf.field_sep ? "%.2f" : "%5.2f%%";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, percent);
}
static int hpp__header_overhead_guest_sys(struct perf_hpp *hpp)
@@ -120,7 +128,9 @@ static int hpp__entry_overhead_guest_sys(struct perf_hpp *hpp,
struct hist_entry *he)
{
double percent = 100.0 * he->period_guest_sys / hpp->total_period;
- return scnprintf(hpp->buf, hpp->size, " %5.2f%% ", percent);
+ const char *fmt = symbol_conf.field_sep ? "%.2f" : " %5.2f%% ";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, percent);
}
static int hpp__header_overhead_guest_us(struct perf_hpp *hpp)
@@ -144,12 +154,16 @@ static int hpp__entry_overhead_guest_us(struct perf_hpp *hpp,
struct hist_entry *he)
{
double percent = 100.0 * he->period_guest_us / hpp->total_period;
- return scnprintf(hpp->buf, hpp->size, " %5.2f%% ", percent);
+ const char *fmt = symbol_conf.field_sep ? "%.2f" : " %5.2f%% ";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, percent);
}
static int hpp__header_samples(struct perf_hpp *hpp)
{
- return scnprintf(hpp->buf, hpp->size, " Samples ");
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%11s";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, "Samples");
}
static int hpp__width_samples(struct perf_hpp *hpp __used)
@@ -159,12 +173,16 @@ static int hpp__width_samples(struct perf_hpp *hpp __used)
static int hpp__entry_samples(struct perf_hpp *hpp, struct hist_entry *he)
{
- return scnprintf(hpp->buf, hpp->size, "%11" PRIu64, he->nr_events);
+ const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%11" PRIu64;
+
+ return scnprintf(hpp->buf, hpp->size, fmt, he->nr_events);
}
static int hpp__header_period(struct perf_hpp *hpp)
{
- return scnprintf(hpp->buf, hpp->size, " Period ");
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%12s";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, "Period");
}
static int hpp__width_period(struct perf_hpp *hpp __used)
@@ -174,12 +192,16 @@ static int hpp__width_period(struct perf_hpp *hpp __used)
static int hpp__entry_period(struct perf_hpp *hpp, struct hist_entry *he)
{
- return scnprintf(hpp->buf, hpp->size, "%12" PRIu64, he->period);
+ const char *fmt = symbol_conf.field_sep ? "%" PRIu64 : "%12" PRIu64;
+
+ return scnprintf(hpp->buf, hpp->size, fmt, he->period);
}
static int hpp__header_delta(struct perf_hpp *hpp)
{
- return scnprintf(hpp->buf, hpp->size, " Delta ");
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%7s";
+
+ return scnprintf(hpp->buf, hpp->size, fmt, "Delta");
}
static int hpp__width_delta(struct perf_hpp *hpp __used)
@@ -193,7 +215,8 @@ static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)
u64 old_total, new_total;
double old_percent = 0, new_percent = 0;
double diff;
- char buf[32];
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%7.7s";
+ char buf[32] = " ";
old_total = pair_hists->stats.total_period;
if (old_total > 0 && he->pair)
@@ -204,11 +227,10 @@ static int hpp__entry_delta(struct perf_hpp *hpp, struct hist_entry *he)
new_percent = 100.0 * he->period / new_total;
diff = new_percent - old_percent;
- if (fabs(diff) < 0.01)
- return scnprintf(hpp->buf, hpp->size, " ");
+ if (fabs(diff) >= 0.01)
+ scnprintf(buf, sizeof(buf), "%+4.2F%%", diff);
- scnprintf(buf, sizeof(buf), "%+4.2F%%", diff);
- return scnprintf(hpp->buf, hpp->size, "%7.7s", buf);
+ return scnprintf(hpp->buf, hpp->size, fmt, buf);
}
static int hpp__header_displ(struct perf_hpp *hpp)
@@ -223,13 +245,13 @@ static int hpp__width_displ(struct perf_hpp *hpp __used)
static int hpp__entry_displ(struct perf_hpp *hpp, struct hist_entry *he __used)
{
- char buf[32];
+ const char *fmt = symbol_conf.field_sep ? "%s" : "%6.6s";
+ char buf[32] = " ";
- if (!hpp->displacement)
- return scnprintf(hpp->buf, hpp->size, " ");
+ if (hpp->displacement)
+ scnprintf(buf, sizeof(buf), "%+4ld", hpp->displacement);
- scnprintf(buf, sizeof(buf), "%+4ld", hpp->displacement);
- return scnprintf(hpp->buf, hpp->size, "%6.6s", buf);
+ return scnprintf(hpp->buf, hpp->size, fmt, buf);
}
#define HPP__COLOR_PRINT_FNS(_name) \
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 4228b4c..882461a 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -319,11 +319,12 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
.displacement = displacement,
.ptr = pair_hists,
};
+ bool color = !symbol_conf.field_sep;
if (size == 0 || size > sizeof(bf))
size = hpp.size = sizeof(bf);
- ret = hist_entry__period_snprintf(&hpp, he, true);
+ ret = hist_entry__period_snprintf(&hpp, he, color);
hist_entry__sort_snprintf(he, bf + ret, size - ret, hists);
ret = fprintf(fp, "%s\n", bf);
--
1.7.1
next prev parent reply other threads:[~2012-09-08 20:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-08 20:36 [GIT PULL 0/9] perf/core improvements and fixes Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 1/9] perf bench: fix assert when NDEBUG is defined Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 2/9] perf hists: Introduce perf_hpp for hist period printing Arnaldo Carvalho de Melo
2012-09-08 20:36 ` Arnaldo Carvalho de Melo [this message]
2012-09-08 20:36 ` [PATCH 4/9] perf hists: Use perf_hpp__format->width to calculate the column widths Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 5/9] perf hists browser: Use perf_hpp__format functions Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 6/9] perf gtk/browser: " Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 7/9] perf annotate: Make a copy of filename for passing to basename Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 8/9] perf probe: Make a copy of exec path " Arnaldo Carvalho de Melo
2012-09-08 20:36 ` [PATCH 9/9] perf symbols: Remove BIONIC wrapper around libgen.h Arnaldo Carvalho de Melo
2012-09-09 8:40 ` [GIT PULL 0/9] perf/core improvements and fixes Ingo Molnar
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=1347136614-25598-4-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
/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).