[PATCH 40/43] perf stat: Propagate struct target arg to sort_aggr_thread

From: Jiri Olsa
Date: Thu Aug 30 2018 - 02:34:05 EST


Propagate struct target arg to sort_aggr_thread
so the function does not depend on stat command object
local target and can be moved out.

Link: http://lkml.kernel.org/n/tip-1q2zv8p9pwa3vddh2js3s9fo@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/builtin-stat.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index c4df076f1e54..486b0cf7818d 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1284,7 +1284,8 @@ static int cmp_val(const void *a, const void *b)
static struct perf_aggr_thread_value *sort_aggr_thread(
struct perf_evsel *counter,
int nthreads, int ncpus,
- int *ret)
+ int *ret,
+ struct target *_target)
{
int cpu, thread, i = 0;
double uval;
@@ -1309,7 +1310,7 @@ static struct perf_aggr_thread_value *sort_aggr_thread(
* Skip value 0 when enabling --per-thread globally,
* otherwise too many 0 output.
*/
- if (uval == 0.0 && target__has_per_thread(&target))
+ if (uval == 0.0 && target__has_per_thread(_target))
continue;

buf[i].counter = counter;
@@ -1330,6 +1331,7 @@ static struct perf_aggr_thread_value *sort_aggr_thread(
}

static void print_aggr_thread(struct perf_stat_config *config,
+ struct target *_target,
struct perf_evsel *counter, char *prefix)
{
FILE *output = config->output;
@@ -1338,7 +1340,7 @@ static void print_aggr_thread(struct perf_stat_config *config,
int thread, sorted_threads, id;
struct perf_aggr_thread_value *buf;

- buf = sort_aggr_thread(counter, nthreads, ncpus, &sorted_threads);
+ buf = sort_aggr_thread(counter, nthreads, ncpus, &sorted_threads, _target);
if (!buf) {
perror("cannot sort aggr thread");
return;
@@ -1754,7 +1756,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
evlist__for_each_entry(evlist, counter) {
if (is_duration_time(counter))
continue;
- print_aggr_thread(config, counter, prefix);
+ print_aggr_thread(config, _target, counter, prefix);
}
break;
case AGGR_GLOBAL:
--
2.17.1