1 files changed, 42 insertions, 12 deletions

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 181389535c0c..c67ecc457d29 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -8,22 +8,25 @@
 #include "map.h"
 #include "build-id.h"
 
-/*
- * PERF_SAMPLE_IP | PERF_SAMPLE_TID | *
- */
-struct ip_event {
+struct mmap_event {
         struct perf_event_header header;
-        u64 ip;
         u32 pid, tid;
-        unsigned char __more_data[];
+        u64 start;
+        u64 len;
+        u64 pgoff;
+        char filename[PATH_MAX];
 };
 
-struct mmap_event {
+struct mmap2_event {
         struct perf_event_header header;
         u32 pid, tid;
         u64 start;
         u64 len;
         u64 pgoff;
+        u32 maj;
+        u32 min;
+        u64 ino;
+        u64 ino_generation;
         char filename[PATH_MAX];
 };
 
@@ -63,7 +66,8 @@ struct read_event {
         (PERF_SAMPLE_IP | PERF_SAMPLE_TID |             \
          PERF_SAMPLE_TIME | PERF_SAMPLE_ADDR |          \
         PERF_SAMPLE_ID | PERF_SAMPLE_STREAM_ID |        \
-         PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD)
+         PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD |         \
+         PERF_SAMPLE_IDENTIFIER)
 
 struct sample_event {
         struct perf_event_header        header;
@@ -71,6 +75,7 @@ struct sample_event {
 };
 
 struct regs_dump {
+        u64 abi;
         u64 *regs;
 };
 
@@ -80,6 +85,23 @@ struct stack_dump {
         char *data;
 };
 
+struct sample_read_value {
+        u64 value;
+        u64 id;
+};
+
+struct sample_read {
+        u64 time_enabled;
+        u64 time_running;
+        union {
+                struct {
+                        u64 nr;
+                        struct sample_read_value *values;
+                } group;
+                struct sample_read_value one;
+        };
+};
+
 struct perf_sample {
         u64 ip;
         u32 pid, tid;
@@ -97,6 +119,7 @@ struct perf_sample {
         struct branch_stack *branch_stack;
         struct regs_dump  user_regs;
         struct stack_dump user_stack;
+        struct sample_read read;
 };
 
 #define PERF_MEM_DATA_SRC_NONE \
@@ -116,7 +139,7 @@ struct build_id_event {
 enum perf_user_event_type { /* above any possible kernel type */
         PERF_RECORD_USER_TYPE_START             = 64,
         PERF_RECORD_HEADER_ATTR                 = 64,
-        PERF_RECORD_HEADER_EVENT_TYPE           = 65,
+        PERF_RECORD_HEADER_EVENT_TYPE           = 65, /* depreceated */
         PERF_RECORD_HEADER_TRACING_DATA         = 66,
         PERF_RECORD_HEADER_BUILD_ID             = 67,
         PERF_RECORD_FINISHED_ROUND              = 68,
@@ -148,8 +171,8 @@ struct tracing_data_event {
 
 union perf_event {
         struct perf_event_header        header;
-        struct ip_event                 ip;
         struct mmap_event               mmap;
+        struct mmap2_event              mmap2;
         struct comm_event               comm;
         struct fork_event               fork;
         struct lost_event               lost;
@@ -199,6 +222,10 @@ int perf_event__process_mmap(struct perf_tool *tool,
                              union perf_event *event,
                              struct perf_sample *sample,
                              struct machine *machine);
+int perf_event__process_mmap2(struct perf_tool *tool,
+                             union perf_event *event,
+                             struct perf_sample *sample,
+                             struct machine *machine);
 int perf_event__process_fork(struct perf_tool *tool,
                              union perf_event *event,
                              struct perf_sample *sample,
@@ -216,17 +243,20 @@ struct addr_location;
 int perf_event__preprocess_sample(const union perf_event *self,
                                   struct machine *machine,
                                   struct addr_location *al,
-                                  struct perf_sample *sample,
-                                  symbol_filter_t filter);
+                                  struct perf_sample *sample);
 
 const char *perf_event__name(unsigned int id);
 
+size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,
+                                     u64 sample_regs_user, u64 read_format);
 int perf_event__synthesize_sample(union perf_event *event, u64 type,
+                                  u64 sample_regs_user, u64 read_format,
                                   const struct perf_sample *sample,
                                   bool swapped);
 
 size_t perf_event__fprintf_comm(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_mmap(union perf_event *event, FILE *fp);
+size_t perf_event__fprintf_mmap2(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf_task(union perf_event *event, FILE *fp);
 size_t perf_event__fprintf(union perf_event *event, FILE *fp);