Commit b251892d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf stat: Move perf_stat_synthesize_config() to event.h 

Together with the other synthsizers, and rename it to
perf_event__synthesize_stat_events().

This allows us to stop including event.h in util/stat.h.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-q5ebhrp44txboobs86htu5r9@git.kernel.org


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

tools/perf/builtin-stat.c

+2 −2
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ try_again: 
		if (err < 0)

			return err;



		err = perf_stat_synthesize_config(&stat_config, NULL, evsel_list,

		err = perf_event__synthesize_stat_events(&stat_config, NULL, evsel_list,

							 process_synthesized_event, is_pipe);

		if (err < 0)

			return err;

tools/perf/util/event.h

+5 −0
Original line number Diff line number Diff line
@@ -293,6 +293,11 @@ typedef int (*perf_event__handler_t)(struct perf_tool *tool, 
				     struct perf_sample *sample,

				     struct machine *machine);



int perf_event__synthesize_stat_events(struct perf_stat_config *config,

				       struct perf_tool *tool,

				       struct evlist *evlist,

				       perf_event__handler_t process,

				       bool attrs);

int perf_event__synthesize_attr(struct perf_tool *tool,

				struct perf_event_attr *attr, u32 ids, u64 *id,

				perf_event__handler_t process);

tools/perf/util/stat.c

+5 −5
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ int create_perf_stat_counter(struct evsel *evsel, 
	return perf_evsel__open_per_thread(evsel, evsel->core.threads);

}



int perf_stat_synthesize_config(struct perf_stat_config *config,

int perf_event__synthesize_stat_events(struct perf_stat_config *config,

				       struct perf_tool *tool,

				       struct evlist *evlist,

				       perf_event__handler_t process,

tools/perf/util/stat.h

+2 −6
Original line number Diff line number Diff line
@@ -7,8 +7,9 @@ 
#include <sys/types.h>

#include <sys/resource.h>

#include "rblist.h"

#include "event.h"



struct perf_cpu_map;

struct perf_stat_config;

struct timespec;



struct stats {
@@ -210,11 +211,6 @@ size_t perf_event__fprintf_stat_config(union perf_event *event, FILE *fp); 
int create_perf_stat_counter(struct evsel *evsel,

			     struct perf_stat_config *config,

			     struct target *target);

int perf_stat_synthesize_config(struct perf_stat_config *config,

				struct perf_tool *tool,

				struct evlist *evlist,

				perf_event__handler_t process,

				bool attrs);

void

perf_evlist__print_counters(struct evlist *evlist,

			    struct perf_stat_config *config,

CRA Git | Maintained and supported by SUSTech CRA and CCSE