Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-param-fixes

[safe/jmp/linux-2.6] / tools / perf / util / event.h

diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index fa2d4e9..2c9c26d 100644 (file)
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -1,5 +1,5 @@
-#ifndef __PERF_EVENT_H
-#define __PERF_EVENT_H
+#ifndef __PERF_RECORD_H
+#define __PERF_RECORD_H
 #include "../perf.h"
 #include "util.h"
 #include <linux/list.h>
@@ -39,6 +39,7 @@ struct fork_event {
        struct perf_event_header header;
        u32 pid, ppid;
        u32 tid, ptid;
+       u64 time;
 };
 
 struct lost_event {
@@ -52,13 +53,19 @@ struct lost_event {
  */
 struct read_event {
        struct perf_event_header header;
-       u32 pid,tid;
+       u32 pid, tid;
        u64 value;
        u64 time_enabled;
        u64 time_running;
        u64 id;
 };
 
+struct sample_event{
+       struct perf_event_header        header;
+       u64 array[];
+};
+
+
 typedef union event_union {
        struct perf_event_header        header;
        struct ip_event                 ip;
@@ -67,6 +74,7 @@ typedef union event_union {
        struct fork_event               fork;
        struct lost_event               lost;
        struct read_event               read;
+       struct sample_event             sample;
 } event_t;
 
 struct map {