97 lines
3.2 KiB
Diff
97 lines
3.2 KiB
Diff
From 36827ecfdf56b255245f4ed510b2d2b2fdba0ddf Mon Sep 17 00:00:00 2001
|
|
From: Jiri Olsa <jolsa@kernel.org>
|
|
Date: Thu, 30 Aug 2018 08:32:26 +0200
|
|
Subject: [PATCH 003/201] perf stat: Add 'struct perf_stat_config' argument to
|
|
perf_evlist__print_counters()
|
|
|
|
mainline inclusion
|
|
from mainline-v4.20-rc1
|
|
commit b64df7f33743cd6095b4a007f5f15ff4432fbcf5
|
|
category: feature
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b64df7f33743cd6095b4a007f5f15ff4432fbcf5
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
Add a 'struct perf_stat_config' argument to perf_evlist__print_counters(),
|
|
so that it can be moved out of the 'perf stat' command to generic object
|
|
in the following patches.
|
|
|
|
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
|
|
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
|
|
Cc: Andi Kleen <andi@firstfloor.org>
|
|
Cc: David Ahern <dsahern@gmail.com>
|
|
Cc: Namhyung Kim <namhyung@kernel.org>
|
|
Cc: Peter Zijlstra <peterz@infradead.org>
|
|
Link: http://lkml.kernel.org/r/20180830063252.23729-18-jolsa@kernel.org
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/perf/builtin-stat.c | 16 +++++++++-------
|
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
|
|
index 78dfefd6f49a..c35307ea6110 100644
|
|
--- a/tools/perf/builtin-stat.c
|
|
+++ b/tools/perf/builtin-stat.c
|
|
@@ -1829,10 +1829,11 @@ static void print_footer(void)
|
|
|
|
static void
|
|
perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
+ struct perf_stat_config *config,
|
|
struct timespec *ts,
|
|
int argc, const char **argv)
|
|
{
|
|
- int interval = stat_config.interval;
|
|
+ int interval = config->interval;
|
|
struct perf_evsel *counter;
|
|
char buf[64], *prefix = NULL;
|
|
|
|
@@ -1848,11 +1849,11 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
print_metric_headers(prefix, false);
|
|
if (num_print_iv++ == 25)
|
|
num_print_iv = 0;
|
|
- if (stat_config.aggr_mode == AGGR_GLOBAL && prefix)
|
|
- fprintf(stat_config.output, "%s", prefix);
|
|
+ if (config->aggr_mode == AGGR_GLOBAL && prefix)
|
|
+ fprintf(config->output, "%s", prefix);
|
|
}
|
|
|
|
- switch (stat_config.aggr_mode) {
|
|
+ switch (config->aggr_mode) {
|
|
case AGGR_CORE:
|
|
case AGGR_SOCKET:
|
|
print_aggr(prefix);
|
|
@@ -1871,7 +1872,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
print_counter_aggr(counter, prefix);
|
|
}
|
|
if (metric_only)
|
|
- fputc('\n', stat_config.output);
|
|
+ fputc('\n', config->output);
|
|
break;
|
|
case AGGR_NONE:
|
|
if (metric_only)
|
|
@@ -1892,7 +1893,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
|
|
if (!interval && !csv_output)
|
|
print_footer();
|
|
|
|
- fflush(stat_config.output);
|
|
+ fflush(config->output);
|
|
}
|
|
|
|
static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
@@ -1901,7 +1902,8 @@ static void print_counters(struct timespec *ts, int argc, const char **argv)
|
|
if (STAT_RECORD && perf_stat.data.is_pipe)
|
|
return;
|
|
|
|
- perf_evlist__print_counters(evsel_list, ts, argc, argv);
|
|
+ perf_evlist__print_counters(evsel_list, &stat_config,
|
|
+ ts, argc, argv);
|
|
}
|
|
|
|
static volatile int signr = -1;
|
|
--
|
|
2.27.0
|
|
|