1 files changed, 39 insertions, 36 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 33c17a2b2a81..5b01449152ef 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2041,6 +2041,8 @@ int perf_session__read_header(struct perf_session *session, int fd)
                 lseek(fd, tmp, SEEK_SET);
         }
 
+        symbol_conf.nr_events = nr_attrs;
+
         if (f_header.event_types.size) {
                 lseek(fd, f_header.event_types.offset, SEEK_SET);
                 events = malloc(f_header.event_types.size);
@@ -2068,9 +2070,9 @@ out_delete_evlist:
         return -ENOMEM;
 }
 
-int perf_event__synthesize_attr(struct perf_event_attr *attr, u16 ids, u64 *id,
-                                perf_event__handler_t process,
-                                struct perf_session *session)
+int perf_event__synthesize_attr(struct perf_tool *tool,
+                                struct perf_event_attr *attr, u16 ids, u64 *id,
+                                perf_event__handler_t process)
 {
         union perf_event *ev;
         size_t size;
@@ -2092,22 +2094,23 @@ int perf_event__synthesize_attr(struct perf_event_attr *attr, u16 ids, u64 *id,
         ev->attr.header.type = PERF_RECORD_HEADER_ATTR;
         ev->attr.header.size = size;
 
-        err = process(ev, NULL, session);
+        err = process(tool, ev, NULL, NULL);
 
         free(ev);
 
         return err;
 }
 
-int perf_session__synthesize_attrs(struct perf_session *session,
+int perf_event__synthesize_attrs(struct perf_tool *tool,
+                                   struct perf_session *session,
                                    perf_event__handler_t process)
 {
         struct perf_evsel *attr;
         int err = 0;
 
         list_for_each_entry(attr, &session->evlist->entries, node) {
-                err = perf_event__synthesize_attr(&attr->attr, attr->ids,
-                                                  attr->id, process, session);
+                err = perf_event__synthesize_attr(tool, &attr->attr, attr->ids,
+                                                  attr->id, process);
                 if (err) {
                         pr_debug("failed to create perf header attribute\n");
                         return err;
@@ -2118,23 +2121,23 @@ int perf_session__synthesize_attrs(struct perf_session *session,
 }
 
 int perf_event__process_attr(union perf_event *event,
-                             struct perf_session *session)
+                             struct perf_evlist **pevlist)
 {
         unsigned int i, ids, n_ids;
         struct perf_evsel *evsel;
+        struct perf_evlist *evlist = *pevlist;
 
-        if (session->evlist == NULL) {
-                session->evlist = perf_evlist__new(NULL, NULL);
-                if (session->evlist == NULL)
+        if (evlist == NULL) {
+                *pevlist = evlist = perf_evlist__new(NULL, NULL);
+                if (evlist == NULL)
                         return -ENOMEM;
         }
 
-        evsel = perf_evsel__new(&event->attr.attr,
-                                session->evlist->nr_entries);
+        evsel = perf_evsel__new(&event->attr.attr, evlist->nr_entries);
         if (evsel == NULL)
                 return -ENOMEM;
 
-        perf_evlist__add(session->evlist, evsel);
+        perf_evlist__add(evlist, evsel);
 
         ids = event->header.size;
         ids -= (void *)&event->attr.id - (void *)event;
@@ -2148,18 +2151,16 @@ int perf_event__process_attr(union perf_event *event,
                 return -ENOMEM;
 
         for (i = 0; i < n_ids; i++) {
-                perf_evlist__id_add(session->evlist, evsel, 0, i,
-                                    event->attr.id[i]);
+                perf_evlist__id_add(evlist, evsel, 0, i, event->attr.id[i]);
         }
 
-        perf_session__update_sample_type(session);
-
         return 0;
 }
 
-int perf_event__synthesize_event_type(u64 event_id, char *name,
+int perf_event__synthesize_event_type(struct perf_tool *tool,
+                                      u64 event_id, char *name,
                                       perf_event__handler_t process,
-                                      struct perf_session *session)
+                                      struct machine *machine)
 {
         union perf_event ev;
         size_t size = 0;
@@ -2177,13 +2178,14 @@ int perf_event__synthesize_event_type(u64 event_id, char *name,
         ev.event_type.header.size = sizeof(ev.event_type) -
                 (sizeof(ev.event_type.event_type.name) - size);
 
-        err = process(&ev, NULL, session);
+        err = process(tool, &ev, NULL, machine);
 
         return err;
 }
 
-int perf_event__synthesize_event_types(perf_event__handler_t process,
-                                       struct perf_session *session)
+int perf_event__synthesize_event_types(struct perf_tool *tool,
+                                       perf_event__handler_t process,
+                                       struct machine *machine)
 {
         struct perf_trace_event_type *type;
         int i, err = 0;
@@ -2191,9 +2193,9 @@ int perf_event__synthesize_event_types(perf_event__handler_t process,
         for (i = 0; i < event_count; i++) {
                 type = &events[i];
 
-                err = perf_event__synthesize_event_type(type->event_id,
+                err = perf_event__synthesize_event_type(tool, type->event_id,
                                                         type->name, process,
-                                                        session);
+                                                        machine);
                 if (err) {
                         pr_debug("failed to create perf header event type\n");
                         return err;
@@ -2203,8 +2205,8 @@ int perf_event__synthesize_event_types(perf_event__handler_t process,
         return err;
 }
 
-int perf_event__process_event_type(union perf_event *event,
-                                   struct perf_session *session __unused)
+int perf_event__process_event_type(struct perf_tool *tool __unused,
+                                   union perf_event *event)
 {
         if (perf_header__push_event(event->event_type.event_type.event_id,
                                     event->event_type.event_type.name) < 0)
@@ -2213,9 +2215,9 @@ int perf_event__process_event_type(union perf_event *event,
         return 0;
 }
 
-int perf_event__synthesize_tracing_data(int fd, struct perf_evlist *evlist,
-                                         perf_event__handler_t process,
-                                   struct perf_session *session __unused)
+int perf_event__synthesize_tracing_data(struct perf_tool *tool, int fd,
+                                        struct perf_evlist *evlist,
+                                        perf_event__handler_t process)
 {
         union perf_event ev;
         struct tracing_data *tdata;
@@ -2246,7 +2248,7 @@ int perf_event__synthesize_tracing_data(int fd, struct perf_evlist *evlist,
         ev.tracing_data.header.size = sizeof(ev.tracing_data);
         ev.tracing_data.size = aligned_size;
 
-        process(&ev, NULL, session);
+        process(tool, &ev, NULL, NULL);
 
         /*
          * The put function will copy all the tracing data
@@ -2288,10 +2290,10 @@ int perf_event__process_tracing_data(union perf_event *event,
         return size_read + padding;
 }
 
-int perf_event__synthesize_build_id(struct dso *pos, u16 misc,
+int perf_event__synthesize_build_id(struct perf_tool *tool,
+                                    struct dso *pos, u16 misc,
                                     perf_event__handler_t process,
-                                    struct machine *machine,
-                                    struct perf_session *session)
+                                    struct machine *machine)
 {
         union perf_event ev;
         size_t len;
@@ -2311,12 +2313,13 @@ int perf_event__synthesize_build_id(struct dso *pos, u16 misc,
         ev.build_id.header.size = sizeof(ev.build_id) + len;
         memcpy(&ev.build_id.filename, pos->long_name, pos->long_name_len);
 
-        err = process(&ev, NULL, session);
+        err = process(tool, &ev, NULL, machine);
 
         return err;
 }
 
-int perf_event__process_build_id(union perf_event *event,
+int perf_event__process_build_id(struct perf_tool *tool __used,
+                                 union perf_event *event,
                                  struct perf_session *session)
 {
         __event_process_build_id(&event->build_id,