From: Andi Kleen <andi@firstfloor.org>
To: acme@kernel.org
Cc: jolsa@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code
Date: Fri, 23 Oct 2015 16:59:30 -0700 [thread overview]
Message-ID: <1445644777-9317-3-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1445644777-9317-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Instead of every caller deciding whether to call abs or nsec printout
do it all in a single central function. No functional changes.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/builtin-stat.c | 57 +++++++++++++++++------------------------------
1 file changed, 20 insertions(+), 37 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 65cd26c..14b6a8a 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -491,7 +491,6 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg)
double msecs = avg / 1e6;
const char *fmt_v, *fmt_n;
char name[25];
- int cpu = cpu_map__id_to_cpu(id);
fmt_v = csv_output ? "%.6f%s" : "%18.6f%s";
fmt_n = csv_output ? "%s" : "%-25s";
@@ -512,12 +511,6 @@ static void nsec_printout(int id, int nr, struct perf_evsel *evsel, double avg)
if (evsel->cgrp)
fprintf(output, "%s%s", csv_sep, evsel->cgrp->name);
-
- if (csv_output || stat_config.interval)
- return;
-
- perf_stat__print_shadow_stats(output, evsel, avg, cpu,
- stat_config.aggr_mode);
}
static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
@@ -525,7 +518,6 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
FILE *output = stat_config.output;
double sc = evsel->scale;
const char *fmt;
- int cpu = cpu_map__id_to_cpu(id);
if (csv_output) {
fmt = sc != 1.0 ? "%.2f%s" : "%.0f%s";
@@ -538,9 +530,6 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
aggr_printout(evsel, id, nr);
- if (stat_config.aggr_mode == AGGR_GLOBAL)
- cpu = 0;
-
fprintf(output, fmt, avg, csv_sep);
if (evsel->unit)
@@ -552,12 +541,24 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
if (evsel->cgrp)
fprintf(output, "%s%s", csv_sep, evsel->cgrp->name);
+}
- if (csv_output || stat_config.interval)
- return;
+static void printout(int id, int nr, struct perf_evsel *counter, double uval)
+{
+ int cpu = cpu_map__id_to_cpu(id);
+
+ if (stat_config.aggr_mode == AGGR_GLOBAL)
+ cpu = 0;
+
+ if (nsec_counter(counter))
+ nsec_printout(id, nr, counter, uval);
+ else
+ abs_printout(id, nr, counter, uval);
- perf_stat__print_shadow_stats(output, evsel, avg, cpu,
- stat_config.aggr_mode);
+ if (!csv_output && !stat_config.interval)
+ perf_stat__print_shadow_stats(stat_config.output, counter,
+ uval, cpu,
+ stat_config.aggr_mode);
}
static void print_aggr(char *prefix)
@@ -613,12 +614,7 @@ static void print_aggr(char *prefix)
continue;
}
uval = val * counter->scale;
-
- if (nsec_counter(counter))
- nsec_printout(id, nr, counter, uval);
- else
- abs_printout(id, nr, counter, uval);
-
+ printout(id, nr, counter, uval);
if (!csv_output)
print_noise(counter, 1.0);
@@ -649,11 +645,7 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
fprintf(output, "%s", prefix);
uval = val * counter->scale;
-
- if (nsec_counter(counter))
- nsec_printout(thread, 0, counter, uval);
- else
- abs_printout(thread, 0, counter, uval);
+ printout(thread, 0, counter, uval);
if (!csv_output)
print_noise(counter, 1.0);
@@ -703,11 +695,7 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
}
uval = avg * counter->scale;
-
- if (nsec_counter(counter))
- nsec_printout(-1, 0, counter, uval);
- else
- abs_printout(-1, 0, counter, uval);
+ printout(-1, 0, counter, uval);
print_noise(counter, avg);
@@ -760,12 +748,7 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
}
uval = val * counter->scale;
-
- if (nsec_counter(counter))
- nsec_printout(cpu, 0, counter, uval);
- else
- abs_printout(cpu, 0, counter, uval);
-
+ printout(cpu, 0, counter, uval);
if (!csv_output)
print_noise(counter, 1.0);
print_running(run, ena);
--
2.4.3
next prev parent reply other threads:[~2015-10-24 0:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 23:59 perf, tools: Refactor and support interval and CSV metrics v5 Andi Kleen
2015-10-23 23:59 ` [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow Andi Kleen
2015-10-23 23:59 ` Andi Kleen [this message]
2015-10-23 23:59 ` [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Andi Kleen
2015-10-23 23:59 ` [PATCH 4/9] perf, tools, stat: Add support for metrics in interval mode Andi Kleen
2015-10-23 23:59 ` [PATCH 5/9] perf, tools, stat: Move noise/running printing into printout Andi Kleen
2015-10-26 15:32 ` Jiri Olsa
2015-10-27 2:42 ` Andi Kleen
2015-10-23 23:59 ` [PATCH 6/9] perf, tools, stat: Implement CSV metrics output Andi Kleen
2015-10-23 23:59 ` [PATCH 7/9] perf, tools, stat: Move non counting counter printing to printout Andi Kleen
2015-10-23 23:59 ` [PATCH 8/9] perf, tools: Support metrics in --per-core/socket mode Andi Kleen
2015-10-23 23:59 ` [PATCH 9/9] perf, tools, stat: Document CSV format in manpage Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2015-11-03 1:50 perf, tools: Refactor and support interval and CSV metrics v6 Andi Kleen
2015-11-03 1:50 ` [PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code Andi Kleen
2015-11-04 8:15 ` Jiri Olsa
2015-09-21 23:49 perf, tools: Refactor and support interval and CSV metrics v4 Andi Kleen
2015-09-21 23:49 ` [PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code Andi Kleen
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=1445644777-9317-3-git-send-email-andi@firstfloor.org \
--to=andi@firstfloor.org \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.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
Powered by JetHome