Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1261143
| From | Andi Kleen <andi@firstfloor.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code |
| Date | 2015-11-03 03:00 +0100 |
| Message-ID | <qqz3d-4xe-47@gated-at.bofh.it> (permalink) |
| References | <qqz3c-4xe-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 8a78895..b74ee0f 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -493,7 +493,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";
@@ -514,12 +513,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)
@@ -527,7 +520,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";
@@ -540,9 +532,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)
@@ -554,12 +543,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)
@@ -615,12 +616,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);
@@ -651,11 +647,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);
@@ -705,11 +697,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);
@@ -762,12 +750,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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
perf, tools: Refactor and support interval and CSV metrics v6 Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
[PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
Re: [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Jiri Olsa <jolsa@redhat.com> - 2015-11-04 09:40 +0100
Re: [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Jiri Olsa <jolsa@redhat.com> - 2015-11-04 09:50 +0100
Re: [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Andi Kleen <andi@firstfloor.org> - 2015-11-05 03:50 +0100
Re: [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Jiri Olsa <jolsa@redhat.com> - 2015-11-05 08:00 +0100
Re: [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Andi Kleen <andi@firstfloor.org> - 2015-11-05 16:30 +0100
[PATCH 4/9] perf, tools, stat: Add support for metrics in interval mode Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
[PATCH 8/9] perf, tools: Support metrics in --per-core/socket mode Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
[PATCH 9/9] perf, tools, stat: Document CSV format in manpage Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
[PATCH 7/9] perf, tools, stat: Move non counting counter printing to printout Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
[PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
Re: [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow Jiri Olsa <jolsa@redhat.com> - 2015-11-04 09:20 +0100
[tip:perf/urgent] perf stat: Move sw clock metrics printout to stat-shadow tip-bot for Andi Kleen <tipbot@zytor.com> - 2015-11-08 08:30 +0100
[PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
Re: [PATCH 2/9] tools, perf, stat: Use common printout faction to avoid duplicated code Jiri Olsa <jolsa@redhat.com> - 2015-11-04 09:20 +0100
[tip:perf/urgent] perf stat: Use common printout function to avoid duplicated code tip-bot for Andi Kleen <tipbot@zytor.com> - 2015-11-08 08:30 +0100
[PATCH 6/9] perf, tools, stat: Implement CSV metrics output Andi Kleen <andi@firstfloor.org> - 2015-11-03 03:00 +0100
Re: perf, tools: Refactor and support interval and CSV metrics v6 Jiri Olsa <jolsa@redhat.com> - 2015-11-03 08:50 +0100
Re: perf, tools: Refactor and support interval and CSV metrics v6 Andi Kleen <andi@firstfloor.org> - 2015-11-05 03:50 +0100
csiph-web