perf tools: Add attr->mmap2 support

[linux-2.6-block.git] / tools / perf / util / tool.h

diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
index b0e1aadba8d5b3dcfa044668baa46918dff83e5d..4385816d3d49643c981f64a310eaaef6d9838738 100644 (file)
--- a/tools/perf/util/tool.h
+++ b/tools/perf/util/tool.h
@@ -18,12 +18,9 @@ typedef int (*event_sample)(struct perf_tool *tool, union perf_event *event,
 typedef int (*event_op)(struct perf_tool *tool, union perf_event *event,
                        struct perf_sample *sample, struct machine *machine);
 
-typedef int (*event_attr_op)(union perf_event *event,
+typedef int (*event_attr_op)(struct perf_tool *tool,
+                            union perf_event *event,
                             struct perf_evlist **pevlist);
-typedef int (*event_simple_op)(struct perf_tool *tool, union perf_event *event);
-
-typedef int (*event_synth_op)(union perf_event *event,
-                             struct perf_session *session);
 
 typedef int (*event_op2)(struct perf_tool *tool, union perf_event *event,
                         struct perf_session *session);
@@ -32,6 +29,7 @@ struct perf_tool {
        event_sample    sample,
                        read;
        event_op        mmap,
+                       mmap2,
                        comm,
                        fork,
                        exit,
@@ -39,8 +37,7 @@ struct perf_tool {
                        throttle,
                        unthrottle;
        event_attr_op   attr;
-       event_synth_op  tracing_data;
-       event_simple_op event_type;
+       event_op2       tracing_data;
        event_op2       finished_round,
                        build_id;
        bool            ordered_samples;