perf tools: Resolve machine earlier and pass it to perf_event_ops

Reducing the exposure of perf_session further, so that we can use the
classes in cases where no perf.data file is created.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-stua66dcscsezzrcdugvbmvd@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 669409d35710..1564877e8703 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -142,56 +142,53 @@ union perf_event {
 void perf_event__print_totals(void);
 
 struct perf_event_ops;
-struct perf_session;
 struct thread_map;
 
 typedef int (*perf_event__handler_t)(struct perf_event_ops *ops,
                                      union perf_event *event,
                                      struct perf_sample *sample,
-                                      struct perf_session *session);
+                                     struct machine *machine);
 
 int perf_event__synthesize_thread_map(struct perf_event_ops *ops,
                                       struct thread_map *threads,
                                       perf_event__handler_t process,
-                                      struct perf_session *session);
+                                      struct machine *machine);
 int perf_event__synthesize_threads(struct perf_event_ops *ops,
                                    perf_event__handler_t process,
-                                   struct perf_session *session);
+                                   struct machine *machine);
 int perf_event__synthesize_kernel_mmap(struct perf_event_ops *ops,
                                        perf_event__handler_t process,
-                                       struct perf_session *session,
                                        struct machine *machine,
                                        const char *symbol_name);
 
 int perf_event__synthesize_modules(struct perf_event_ops *ops,
                                    perf_event__handler_t process,
-                                   struct perf_session *session,
                                    struct machine *machine);
 
 int perf_event__process_comm(struct perf_event_ops *ops,
                              union perf_event *event,
                              struct perf_sample *sample,
-                             struct perf_session *session);
+                             struct machine *machine);
 int perf_event__process_lost(struct perf_event_ops *ops,
                              union perf_event *event,
                              struct perf_sample *sample,
-                             struct perf_session *session);
+                             struct machine *machine);
 int perf_event__process_mmap(struct perf_event_ops *ops,
                              union perf_event *event,
                              struct perf_sample *sample,
-                             struct perf_session *session);
+                             struct machine *machine);
 int perf_event__process_task(struct perf_event_ops *ops,
                              union perf_event *event,
                              struct perf_sample *sample,
-                             struct perf_session *session);
+                             struct machine *machine);
 int perf_event__process(struct perf_event_ops *ops,
                         union perf_event *event,
                         struct perf_sample *sample,
-                        struct perf_session *session);
+                        struct machine *machine);
 
 struct addr_location;
 int perf_event__preprocess_sample(const union perf_event *self,
-                                  struct perf_session *session,
+                                  struct machine *machine,
                                   struct addr_location *al,
                                   struct perf_sample *sample,
                                   symbol_filter_t filter);