perf stat: Move perf_stat_synthesize_config() to event.h
A message that is not in the archive (sent off-list or not yet received): [email protected]
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: b251892d6ceafa3c8f8e6835a664e248766b1b3e Gitweb: https://git.kernel.org/tip/b251892d6ceafa3c8f8e6835a664e248766b1b3e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 10 Sep 2019 17:17:33 +01:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Fri, 20 Sep 2019 09:19:21 -03:00
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 <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-stat.c | 4 ++-- tools/perf/util/event.h | 5 +++++ tools/perf/util/stat.c | 10 +++++----- tools/perf/util/stat.h | 8 ++------ 4 files changed, 14 insertions(+), 13 deletions(-)
tools/perf/builtin-stat.c +2 -2
@@ -540,8 +540,8 @@ try_again:if (err <0 )return err; - err =perf_stat_synthesize_config (&stat_config,NULL , evsel_list, - process_synthesized_event, is_pipe); + 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
@@ -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
@@ -495,11 +495,11 @@ 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, -struct perf_tool *tool, -struct evlist *evlist, -perf_event__handler_t process, -bool attrs) +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 err;
tools/perf/util/stat.h +2 -6
@@ -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,