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

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

perf stat: Move perf_stat_synthesize_config() to stat.c



So that it can be used globally.

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


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c2c247f2
Loading
Loading
Loading
Loading
+0 −42
Original line number Original line Diff line number Diff line
@@ -402,48 +402,6 @@ static void workload_exec_failed_signal(int signo __maybe_unused, siginfo_t *inf
	workload_exec_errno = info->si_value.sival_int;
	workload_exec_errno = info->si_value.sival_int;
}
}


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);
		if (err < 0) {
			pr_err("Couldn't synthesize attrs.\n");
			return err;
		}
	}

	err = perf_event__synthesize_extra_attr(tool, evlist, process,
						attrs);

	err = perf_event__synthesize_thread_map2(tool, evlist->threads,
						 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, NULL);
	if (err < 0) {
		pr_err("Couldn't synthesize thread map.\n");
		return err;
	}

	err = perf_event__synthesize_stat_config(tool, config, process, NULL);
	if (err < 0) {
		pr_err("Couldn't synthesize config.\n");
		return err;
	}

	return 0;
}

static bool perf_evsel__should_store_id(struct perf_evsel *counter)
static bool perf_evsel__should_store_id(struct perf_evsel *counter)
{
{
	return STAT_RECORD || counter->attr.read_format & PERF_FORMAT_ID;
	return STAT_RECORD || counter->attr.read_format & PERF_FORMAT_ID;
+42 −0
Original line number Original line Diff line number Diff line
@@ -488,3 +488,45 @@ int create_perf_stat_counter(struct perf_evsel *evsel,


	return perf_evsel__open_per_thread(evsel, evsel->threads);
	return perf_evsel__open_per_thread(evsel, evsel->threads);
}
}

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);
		if (err < 0) {
			pr_err("Couldn't synthesize attrs.\n");
			return err;
		}
	}

	err = perf_event__synthesize_extra_attr(tool, evlist, process,
						attrs);

	err = perf_event__synthesize_thread_map2(tool, evlist->threads,
						 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, NULL);
	if (err < 0) {
		pr_err("Couldn't synthesize thread map.\n");
		return err;
	}

	err = perf_event__synthesize_stat_config(tool, config, process, NULL);
	if (err < 0) {
		pr_err("Couldn't synthesize config.\n");
		return err;
	}

	return 0;
}
+6 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@
#include "xyarray.h"
#include "xyarray.h"
#include "rblist.h"
#include "rblist.h"
#include "perf.h"
#include "perf.h"
#include "event.h"


struct stats {
struct stats {
	double n, mean, M2;
	double n, mean, M2;
@@ -179,4 +180,9 @@ size_t perf_event__fprintf_stat_config(union perf_event *event, FILE *fp);
int create_perf_stat_counter(struct perf_evsel *evsel,
int create_perf_stat_counter(struct perf_evsel *evsel,
			     struct perf_stat_config *config,
			     struct perf_stat_config *config,
			     struct target *target);
			     struct target *target);
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);
#endif
#endif