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

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

perf stat: Add 'perf_event__handler_t' argument to perf_stat_synthesize_config() 



So that it's completely independent and can be 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-14-jolsa@kernel.org


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

tools/perf/builtin-stat.c

+7 −10
Original line number Diff line number Diff line
@@ -405,40 +405,37 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf 
static int perf_stat_synthesize_config(struct perf_stat_config *config,

				       struct perf_tool *tool,

				       struct perf_evlist *evlist,

				       perf_event__handler_t process,

				       bool attrs)

{

	int err;



	if (attrs) {

		err = perf_event__synthesize_attrs(tool, evlist,

						   process_synthesized_event);

		err = perf_event__synthesize_attrs(tool, evlist, process);

		if (err < 0) {

			pr_err("Couldn't synthesize attrs.\n");

			return err;

		}

	}



	err = perf_event__synthesize_extra_attr(tool, evlist,

						process_synthesized_event,

	err = perf_event__synthesize_extra_attr(tool, evlist, process,

						attrs);



	err = perf_event__synthesize_thread_map2(tool, evlist->threads,

						process_synthesized_event,

						NULL);

						 process, NULL);

	if (err < 0) {

		pr_err("Couldn't synthesize thread map.\n");

		return err;

	}



	err = perf_event__synthesize_cpu_map(tool, evlist->cpus,

					     process_synthesized_event, NULL);

					     process, NULL);

	if (err < 0) {

		pr_err("Couldn't synthesize thread map.\n");

		return err;

	}



	err = perf_event__synthesize_stat_config(tool, config,

						 process_synthesized_event, NULL);

	err = perf_event__synthesize_stat_config(tool, config, process, NULL);

	if (err < 0) {

		pr_err("Couldn't synthesize config.\n");

		return err;
@@ -609,7 +606,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) 
			return err;



		err = perf_stat_synthesize_config(&stat_config, NULL, evsel_list,

						  is_pipe);

						  process_synthesized_event, is_pipe);

		if (err < 0)

			return err;

	}