Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc0bcda2 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Pass 'evlist' argument to print functions 



Add 'evlist' argument to print functions to get rid of the global
'evsel_list' variable dependency.

Signed-off-by: default avatarJiri 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-26-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c512e0ea

tools/perf/builtin-stat.c

+13 −9
Original line number Original line Diff line number Diff line
@@ -1222,6 +1222,7 @@ static void aggr_cb(struct perf_evsel *counter, void *data, bool first) 
}

}





static void print_aggr(struct perf_stat_config *config,

static void print_aggr(struct perf_stat_config *config,

		       struct perf_evlist *evlist,

		       char *prefix)

		       char *prefix)

{

{

	bool metric_only = config->metric_only;

	bool metric_only = config->metric_only;
@@ -1248,7 +1249,7 @@ static void print_aggr(struct perf_stat_config *config, 




		ad.id = id = aggr_map->map[s];

		ad.id = id = aggr_map->map[s];

		first = true;

		first = true;

		evlist__for_each_entry(evsel_list, counter) {

		evlist__for_each_entry(evlist, counter) {

			if (is_duration_time(counter))

			if (is_duration_time(counter))

				continue;

				continue;
@@ -1449,6 +1450,7 @@ static void print_counter(struct perf_stat_config *config, 
}

}





static void print_no_aggr_metric(struct perf_stat_config *config,

static void print_no_aggr_metric(struct perf_stat_config *config,

				 struct perf_evlist *evlist,

				 char *prefix)

				 char *prefix)

{

{

	int cpu;

	int cpu;
@@ -1457,13 +1459,13 @@ static void print_no_aggr_metric(struct perf_stat_config *config, 
	u64 ena, run, val;

	u64 ena, run, val;

	double uval;

	double uval;





	nrcpus = evsel_list->cpus->nr;

	nrcpus = evlist->cpus->nr;

	for (cpu = 0; cpu < nrcpus; cpu++) {

	for (cpu = 0; cpu < nrcpus; cpu++) {

		bool first = true;

		bool first = true;





		if (prefix)

		if (prefix)

			fputs(prefix, config->output);

			fputs(prefix, config->output);

		evlist__for_each_entry(evsel_list, counter) {

		evlist__for_each_entry(evlist, counter) {

			if (is_duration_time(counter))

			if (is_duration_time(counter))

				continue;

				continue;

			if (first) {

			if (first) {
@@ -1499,6 +1501,7 @@ static const char *aggr_header_csv[] = { 
};

};





static void print_metric_headers(struct perf_stat_config *config,

static void print_metric_headers(struct perf_stat_config *config,

				 struct perf_evlist *evlist,

				 const char *prefix, bool no_indent)

				 const char *prefix, bool no_indent)

{

{

	struct perf_stat_output_ctx out;

	struct perf_stat_output_ctx out;
@@ -1520,7 +1523,7 @@ static void print_metric_headers(struct perf_stat_config *config, 
	}

	}





	/* Print metrics headers only */

	/* Print metrics headers only */

	evlist__for_each_entry(evsel_list, counter) {

	evlist__for_each_entry(evlist, counter) {

		if (is_duration_time(counter))

		if (is_duration_time(counter))

			continue;

			continue;

		os.evsel = counter;

		os.evsel = counter;
@@ -1539,6 +1542,7 @@ static void print_metric_headers(struct perf_stat_config *config, 
}

}





static void print_interval(struct perf_stat_config *config,

static void print_interval(struct perf_stat_config *config,

			   struct perf_evlist *evlist,

			   char *prefix, struct timespec *ts)

			   char *prefix, struct timespec *ts)

{

{

	bool metric_only = config->metric_only;

	bool metric_only = config->metric_only;
@@ -1584,7 +1588,7 @@ static void print_interval(struct perf_stat_config *config, 
	}

	}





	if ((num_print_interval == 0 || config->interval_clear) && metric_only)

	if ((num_print_interval == 0 || config->interval_clear) && metric_only)

		print_metric_headers(config, " ", true);

		print_metric_headers(config, evlist, " ", true);

	if (++num_print_interval == 25)

	if (++num_print_interval == 25)

		num_print_interval = 0;

		num_print_interval = 0;

}

}
@@ -1727,7 +1731,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist, 
	char buf[64], *prefix = NULL;

	char buf[64], *prefix = NULL;





	if (interval)

	if (interval)

		print_interval(config, prefix = buf, ts);

		print_interval(config, evlist, prefix = buf, ts);

	else

	else

		print_header(config, _target, argc, argv);

		print_header(config, _target, argc, argv);
@@ -1735,7 +1739,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist, 
		static int num_print_iv;

		static int num_print_iv;





		if (num_print_iv == 0 && !interval)

		if (num_print_iv == 0 && !interval)

			print_metric_headers(config, prefix, false);

			print_metric_headers(config, evlist, prefix, false);

		if (num_print_iv++ == 25)

		if (num_print_iv++ == 25)

			num_print_iv = 0;

			num_print_iv = 0;

		if (config->aggr_mode == AGGR_GLOBAL && prefix)

		if (config->aggr_mode == AGGR_GLOBAL && prefix)
@@ -1745,7 +1749,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist, 
	switch (config->aggr_mode) {

	switch (config->aggr_mode) {

	case AGGR_CORE:

	case AGGR_CORE:

	case AGGR_SOCKET:

	case AGGR_SOCKET:

		print_aggr(config, prefix);

		print_aggr(config, evlist, prefix);

		break;

		break;

	case AGGR_THREAD:

	case AGGR_THREAD:

		evlist__for_each_entry(evlist, counter) {

		evlist__for_each_entry(evlist, counter) {
@@ -1765,7 +1769,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist, 
		break;

		break;

	case AGGR_NONE:

	case AGGR_NONE:

		if (metric_only)

		if (metric_only)

			print_no_aggr_metric(config, prefix);

			print_no_aggr_metric(config, evlist, prefix);

		else {

		else {

			evlist__for_each_entry(evlist, counter) {

			evlist__for_each_entry(evlist, counter) {

				if (is_duration_time(counter))

				if (is_duration_time(counter))