From: Andi Kleen <andi@firstfloor.org>
To: jolsa@kernel.org
Cc: acme@kernel.org, mingo@kernel.org, linux-kernel@vger.kernel.org,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH 5/9] perf, tools, stat: Move noise/running printing into printout
Date: Mon, 2 Nov 2015 17:50:24 -0800 [thread overview]
Message-ID: <1446515428-7450-6-git-send-email-andi@firstfloor.org> (raw)
In-Reply-To: <1446515428-7450-1-git-send-email-andi@firstfloor.org>
From: Andi Kleen <ak@linux.intel.com>
Move the running/noise printing into printout to avoid
duplicated code in the callers.
v2: Merged with other patches. Remove unnecessary hunk.
Readd hunk that ended in earlier patch.
v3: Fix noise/running output in CSV mode
Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/builtin-stat.c | 50 ++++++++---------------------------------------
1 file changed, 8 insertions(+), 42 deletions(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index f13c02d..c6835a4 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -588,7 +588,7 @@ static void abs_printout(int id, int nr, struct perf_evsel *evsel, double avg)
}
static void printout(int id, int nr, struct perf_evsel *counter, double uval,
- char *prefix)
+ char *prefix, u64 run, u64 ena, double noise)
{
struct perf_stat_output_ctx out;
struct outstate os = {
@@ -614,6 +614,9 @@ static void printout(int id, int nr, struct perf_evsel *counter, double uval,
stat_config.aggr_mode == AGGR_GLOBAL ? 0 :
cpu_map__id_to_cpu(id),
&out);
+
+ print_noise(counter, noise);
+ print_running(run, ena);
}
static void print_aggr(char *prefix)
@@ -669,11 +672,7 @@ static void print_aggr(char *prefix)
continue;
}
uval = val * counter->scale;
- printout(id, nr, counter, uval, prefix);
- if (!csv_output)
- print_noise(counter, 1.0);
-
- print_running(run, ena);
+ printout(id, nr, counter, uval, prefix, run, ena, 1.0);
fputc('\n', output);
}
}
@@ -700,12 +699,7 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix)
fprintf(output, "%s", prefix);
uval = val * counter->scale;
- printout(thread, 0, counter, uval, prefix);
-
- if (!csv_output)
- print_noise(counter, 1.0);
-
- print_running(run, ena);
+ printout(thread, 0, counter, uval, prefix, run, ena, 1.0);
fputc('\n', output);
}
}
@@ -719,7 +713,6 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
FILE *output = stat_config.output;
struct perf_stat_evsel *ps = counter->priv;
double avg = avg_stats(&ps->res_stats[0]);
- int scaled = counter->counts->scaled;
double uval;
double avg_enabled, avg_running;
@@ -729,32 +722,8 @@ static void print_counter_aggr(struct perf_evsel *counter, char *prefix)
if (prefix)
fprintf(output, "%s", prefix);
- if (scaled == -1 || !counter->supported) {
- fprintf(output, "%*s%s",
- csv_output ? 0 : 18,
- counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED,
- csv_sep);
- fprintf(output, "%-*s%s",
- csv_output ? 0 : unit_width,
- counter->unit, csv_sep);
- fprintf(output, "%*s",
- csv_output ? 0 : -25,
- perf_evsel__name(counter));
-
- if (counter->cgrp)
- fprintf(output, "%s%s", csv_sep, counter->cgrp->name);
-
- print_running(avg_running, avg_enabled);
- fputc('\n', output);
- return;
- }
-
uval = avg * counter->scale;
- printout(-1, 0, counter, uval, prefix);
-
- print_noise(counter, avg);
-
- print_running(avg_running, avg_enabled);
+ printout(-1, 0, counter, uval, prefix, avg_running, avg_enabled, avg);
fprintf(output, "\n");
}
@@ -803,10 +772,7 @@ static void print_counter(struct perf_evsel *counter, char *prefix)
}
uval = val * counter->scale;
- printout(cpu, 0, counter, uval, prefix);
- if (!csv_output)
- print_noise(counter, 1.0);
- print_running(run, ena);
+ printout(cpu, 0, counter, uval, prefix, run, ena, 1.0);
fputc('\n', output);
}
--
2.4.3
next prev parent reply other threads:[~2015-11-03 1:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 1:50 perf, tools: Refactor and support interval and CSV metrics v6 Andi Kleen
2015-11-03 1:50 ` [PATCH 1/9] perf, tools, stat: Move sw clock metrics printout to stat-shadow Andi Kleen
2015-11-04 8:15 ` Jiri Olsa
2015-11-08 7:28 ` [tip:perf/urgent] perf " tip-bot for 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-11-08 7:28 ` [tip:perf/urgent] perf stat: Use common printout function " tip-bot for Andi Kleen
2015-11-03 1:50 ` [PATCH 3/9] perf, tools, stat: Abstract stat metrics printing Andi Kleen
2015-11-04 8:34 ` Jiri Olsa
2015-11-04 8:42 ` Jiri Olsa
2015-11-05 2:43 ` Andi Kleen
2015-11-05 6:52 ` Jiri Olsa
2015-11-05 15:20 ` Andi Kleen
2015-11-03 1:50 ` [PATCH 4/9] perf, tools, stat: Add support for metrics in interval mode Andi Kleen
2015-11-03 1:50 ` Andi Kleen [this message]
2015-11-04 8:48 ` [PATCH 5/9] perf, tools, stat: Move noise/running printing into printout Jiri Olsa
2015-11-03 1:50 ` [PATCH 6/9] perf, tools, stat: Implement CSV metrics output Andi Kleen
2015-11-03 1:50 ` [PATCH 7/9] perf, tools, stat: Move non counting counter printing to printout Andi Kleen
2015-11-03 1:50 ` [PATCH 8/9] perf, tools: Support metrics in --per-core/socket mode Andi Kleen
2015-11-03 1:50 ` [PATCH 9/9] perf, tools, stat: Document CSV format in manpage Andi Kleen
2015-11-03 7:46 ` perf, tools: Refactor and support interval and CSV metrics v6 Jiri Olsa
2015-11-05 2:43 ` Andi Kleen
-- strict thread matches above, loose matches on Subject: below --
2015-10-23 23:59 perf, tools: Refactor and support interval and CSV metrics v5 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-09-21 23:49 perf, tools: Refactor and support interval and CSV metrics v4 Andi Kleen
2015-09-21 23:50 ` [PATCH 5/9] perf, tools, stat: Move noise/running printing into printout Andi Kleen
2015-09-24 9:01 ` 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=1446515428-7450-6-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;
as well as URLs for NNTP newsgroup(s).