From: Arnaldo Carvalho de Melo <[email protected]> Where is the perf_event__handler_t typedef they need, which was the only reason for header.h to be including event.h, untangle that.
Cc: Adrian Hunter <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Link: https://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/perf/util/event.h | 36 ++++++++++++++++++++++++++++++++++ tools/perf/util/header.h | 42 +++------------------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 47ad81d47b1a..4e6d33c76d57 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -279,6 +279,9 @@ enum { void perf_event__print_totals(void); +struct evlist; +struct evsel; +struct perf_session; struct perf_tool; struct perf_thread_map; struct perf_cpu_map; @@ -290,6 +293,39 @@ typedef int (*perf_event__handler_t)(struct perf_tool *tool, struct perf_sample *sample, struct machine *machine); +int perf_event__synthesize_attr(struct perf_tool *tool, + struct perf_event_attr *attr, u32 ids, u64 *id, + perf_event__handler_t process); +int perf_event__synthesize_attrs(struct perf_tool *tool, + struct evlist *evlist, + perf_event__handler_t process); +int perf_event__synthesize_build_id(struct perf_tool *tool, + struct dso *pos, u16 misc, + perf_event__handler_t process, + struct machine *machine); +int perf_event__synthesize_extra_attr(struct perf_tool *tool, + struct evlist *evsel_list, + perf_event__handler_t process, + bool is_pipe); +int perf_event__synthesize_event_update_cpus(struct perf_tool *tool, + struct evsel *evsel, + perf_event__handler_t process); +int perf_event__synthesize_event_update_name(struct perf_tool *tool, + struct evsel *evsel, + perf_event__handler_t process); +int perf_event__synthesize_event_update_scale(struct perf_tool *tool, + struct evsel *evsel, + perf_event__handler_t process); +int perf_event__synthesize_event_update_unit(struct perf_tool *tool, + struct evsel *evsel, + perf_event__handler_t process); +int perf_event__synthesize_features(struct perf_tool *tool, + struct perf_session *session, + struct evlist *evlist, + perf_event__handler_t process); +int perf_event__synthesize_tracing_data(struct perf_tool *tool, + int fd, struct evlist *evlist, + perf_event__handler_t process); int perf_event__synthesize_thread_map(struct perf_tool *tool, struct perf_thread_map *threads, perf_event__handler_t process, diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 3e48ae3c49b1..999dac41871e 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -5,10 +5,10 @@ #include <linux/stddef.h> #include <linux/perf_event.h> #include <sys/types.h> +#include <stdio.h> // FILE #include <stdbool.h> #include <linux/bitmap.h> #include <linux/types.h> -#include "event.h" #include "env.h" #include "pmu.h" @@ -94,6 +94,8 @@ struct perf_header { struct evlist; struct perf_session; +struct perf_tool; +union perf_event; int perf_session__read_header(struct perf_session *session); int perf_session__write_header(struct perf_session *session, @@ -115,54 +117,16 @@ int perf_header__process_sections(struct perf_header *header, int fd, int perf_header__fprintf_info(struct perf_session *s, FILE *fp, bool full); -int perf_event__synthesize_features(struct perf_tool *tool, - struct perf_session *session, - struct evlist *evlist, - perf_event__handler_t process); - -int perf_event__synthesize_extra_attr(struct perf_tool *tool, - struct evlist *evsel_list, - perf_event__handler_t process, - bool is_pipe); - int perf_event__process_feature(struct perf_session *session, union perf_event *event); - -int perf_event__synthesize_attr(struct perf_tool *tool, - struct perf_event_attr *attr, u32 ids, u64 *id, - perf_event__handler_t process); -int perf_event__synthesize_attrs(struct perf_tool *tool, - struct evlist *evlist, - perf_event__handler_t process); -int perf_event__synthesize_event_update_unit(struct perf_tool *tool, - struct evsel *evsel, - perf_event__handler_t process); -int perf_event__synthesize_event_update_scale(struct perf_tool *tool, - struct evsel *evsel, - perf_event__handler_t process); -int perf_event__synthesize_event_update_name(struct perf_tool *tool, - struct evsel *evsel, - perf_event__handler_t process); -int perf_event__synthesize_event_update_cpus(struct perf_tool *tool, - struct evsel *evsel, - perf_event__handler_t process); int perf_event__process_attr(struct perf_tool *tool, union perf_event *event, struct evlist **pevlist); int perf_event__process_event_update(struct perf_tool *tool, union perf_event *event, struct evlist **pevlist); size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp); - -int perf_event__synthesize_tracing_data(struct perf_tool *tool, - int fd, struct evlist *evlist, - perf_event__handler_t process); int perf_event__process_tracing_data(struct perf_session *session, union perf_event *event); - -int perf_event__synthesize_build_id(struct perf_tool *tool, - struct dso *pos, u16 misc, - perf_event__handler_t process, - struct machine *machine); int perf_event__process_build_id(struct perf_session *session, union perf_event *event); bool is_perf_magic(u64 magic); -- 2.21.0
