1 files changed, 21 insertions, 39 deletions

diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 3e48ae3c49b1..ca53a929e9fd 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"
 
@@ -92,8 +92,28 @@ struct perf_header {
         struct perf_env         env;
 };
 
+struct feat_fd {
+        struct perf_header *ph;
+        int                fd;
+        void               *buf;        /* Either buf != NULL or fd >= 0 */
+        ssize_t            offset;
+        size_t             size;
+        struct evsel       *events;
+};
+
+struct perf_header_feature_ops {
+        int        (*write)(struct feat_fd *ff, struct evlist *evlist);
+        void       (*print)(struct feat_fd *ff, FILE *fp);
+        int        (*process)(struct feat_fd *ff, void *data);
+        const char *name;
+        bool       full_only;
+        bool       synthesize;
+};
+
 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 +135,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);