lkml.org 
[lkml]   [2018]   [Aug]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 17/43] perf stat: Add stat_config argument to perf_evlist__print_counters
Date
Adding stat_config argument perf_evlist__print_counters,
so the function could be moved out of stat command to
generic object in following patches.

Link: http://lkml.kernel.org/n/tip-spaw3m5jf1o6ycv39j57va1e@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
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 4ffbb6594eb6..f340641fe63a 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1694,10 +1694,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;

@@ -1713,11 +1714,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);
@@ -1736,7 +1737,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)
@@ -1757,7 +1758,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)
@@ -1766,7 +1767,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.17.1
\
 
 \ /
  Last update: 2018-08-30 08:37    [W:0.397 / U:0.444 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site