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

perf stat: Move 'print_mixed_hw_group_error' to 'struct perf_stat_config' 



Move the 'print_mixed_hw_group_error' global variable to 'struct perf_stat_config',
so that it can be passed around and used outside the 'perf stat' command.

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-35-jolsa@kernel.org


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

tools/perf/builtin-stat.c

+2 −3
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ static bool append_file; 
static bool			interval_count;

static const char		*output_name;

static int			output_fd;

static int			print_mixed_hw_group_error;

static u64			*walltime_run;

static bool			ru_display			= false;

static struct rusage		ru_data;
@@ -1052,7 +1051,7 @@ static void printout(struct perf_stat_config *config, int id, int nr, 
		if (counter->supported) {

			config->print_free_counters_hint = 1;

			if (is_mixed_hw_group(counter))

				print_mixed_hw_group_error = 1;

				config->print_mixed_hw_group_error = 1;

		}



		fprintf(config->output, "%-*s%s",
@@ -1715,7 +1714,7 @@ static void print_footer(struct perf_stat_config *config) 
"	perf stat ...\n"

"	echo 1 > /proc/sys/kernel/nmi_watchdog\n");



	if (print_mixed_hw_group_error)

	if (config->print_mixed_hw_group_error)

		fprintf(output,

			"The events in group usually have to be from "

			"the same PMU. Try reorganizing the group.\n");

tools/perf/util/stat.h

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ struct perf_stat_config { 
	int			 times;

	int			 run_count;

	int			 print_free_counters_hint;

	int			 print_mixed_hw_group_error;

	struct runtime_stat	*stats;

	int			 stats_num;

	const char		*csv_sep;

CRA Git | Maintained and supported by SUSTech CRA and CCSE