Merge branch 'perf/urgent' into perf/core

[linux-flexiantxendom0-3.2.10.git] / tools / perf / perf.h

diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 3afa39a..89e3355 100644 (file)
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -173,7 +173,6 @@ sys_perf_event_open(struct perf_event_attr *attr,
                      pid_t pid, int cpu, int group_fd,
                      unsigned long flags)
 {
-       attr->size = sizeof(*attr);
        return syscall(__NR_perf_event_open, attr, pid, cpu,
                       group_fd, flags);
 }
@@ -186,14 +185,32 @@ struct ip_callchain {
        u64 ips[0];
 };
 
+struct branch_flags {
+       u64 mispred:1;
+       u64 predicted:1;
+       u64 reserved:62;
+};
+
+struct branch_entry {
+       u64                             from;
+       u64                             to;
+       struct branch_flags flags;
+};
+
+struct branch_stack {
+       u64                             nr;
+       struct branch_entry     entries[0];
+};
+
 extern bool perf_host, perf_guest;
 extern const char perf_version_string[];
 
 void pthread__unblock_sigwinch(void);
 
 struct perf_record_opts {
-       pid_t        target_pid;
-       pid_t        target_tid;
+       const char   *target_pid;
+       const char   *target_tid;
+       uid_t        uid;
        bool         call_graph;
        bool         group;
        bool         inherit_stat;
@@ -204,13 +221,14 @@ struct perf_record_opts {
        bool         raw_samples;
        bool         sample_address;
        bool         sample_time;
-       bool         sample_id_all_avail;
+       bool         sample_id_all_missing;
        bool         exclude_guest_missing;
        bool         system_wide;
        bool         period;
        unsigned int freq;
        unsigned int mmap_pages;
        unsigned int user_freq;
+       int          branch_stack;
        u64          default_interval;
        u64          user_interval;
        const char   *cpu_list;