Browse Source

perf stat: Propagate 'struct target' arg to sort_aggr_thread()

Propagate the 'struct target' arg to sort_aggr_thread() so that the
function does not depend on the 'perf stat' command object local
variable 'target' and can be moved out.

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-41-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Jiri Olsa 7 years ago
parent
commit
be54d59325
1 changed files with 6 additions and 4 deletions
  1. 6 4
      tools/perf/builtin-stat.c

+ 6 - 4
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(
 static struct perf_aggr_thread_value *sort_aggr_thread(
 					struct perf_evsel *counter,
 					struct perf_evsel *counter,
 					int nthreads, int ncpus,
 					int nthreads, int ncpus,
-					int *ret)
+					int *ret,
+					struct target *_target)
 {
 {
 	int cpu, thread, i = 0;
 	int cpu, thread, i = 0;
 	double uval;
 	double uval;
@@ -1309,7 +1310,7 @@ static struct perf_aggr_thread_value *sort_aggr_thread(
 		 * Skip value 0 when enabling --per-thread globally,
 		 * Skip value 0 when enabling --per-thread globally,
 		 * otherwise too many 0 output.
 		 * otherwise too many 0 output.
 		 */
 		 */
-		if (uval == 0.0 && target__has_per_thread(&target))
+		if (uval == 0.0 && target__has_per_thread(_target))
 			continue;
 			continue;
 
 
 		buf[i].counter = counter;
 		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,
 static void print_aggr_thread(struct perf_stat_config *config,
+			      struct target *_target,
 			      struct perf_evsel *counter, char *prefix)
 			      struct perf_evsel *counter, char *prefix)
 {
 {
 	FILE *output = config->output;
 	FILE *output = config->output;
@@ -1338,7 +1340,7 @@ static void print_aggr_thread(struct perf_stat_config *config,
 	int thread, sorted_threads, id;
 	int thread, sorted_threads, id;
 	struct perf_aggr_thread_value *buf;
 	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) {
 	if (!buf) {
 		perror("cannot sort aggr thread");
 		perror("cannot sort aggr thread");
 		return;
 		return;
@@ -1754,7 +1756,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,
 		evlist__for_each_entry(evlist, counter) {
 		evlist__for_each_entry(evlist, counter) {
 			if (is_duration_time(counter))
 			if (is_duration_time(counter))
 				continue;
 				continue;
-			print_aggr_thread(config, counter, prefix);
+			print_aggr_thread(config, _target, counter, prefix);
 		}
 		}
 		break;
 		break;
 	case AGGR_GLOBAL:
 	case AGGR_GLOBAL: