Merge branch 'linus' into x86/urgent

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / tools / perf / util / evsel.h

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index eecdc3aabc147062300730589ffbd41d37c201ce..6710ab538342fe1d5970c812423908ddec3ee5a7 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -6,6 +6,8 @@
 #include "../../../include/linux/perf_event.h"
 #include "types.h"
 #include "xyarray.h"
+#include "cgroup.h"
+#include "hist.h"
  
 struct perf_counts_values {
        union {
@@ -36,15 +38,29 @@ struct perf_sample_id {
        struct perf_evsel       *evsel;
 };
 
+/** struct perf_evsel - event selector
+ *
+ * @name - Can be set to retain the original event name passed by the user,
+ *         so that when showing results in tools such as 'perf stat', we
+ *         show the name used, not some alias.
+ */
 struct perf_evsel {
        struct list_head        node;
        struct perf_event_attr  attr;
        char                    *filter;
        struct xyarray          *fd;
-       struct xyarray          *id;
+       struct xyarray          *sample_id;
+       u64                     *id;
        struct perf_counts      *counts;
        int                     idx;
-       void                    *priv;
+       int                     ids;
+       struct hists            hists;
+       char                    *name;
+       union {
+               void            *priv;
+               off_t           id_offset;
+       };
+       struct cgroup_sel       *cgrp;
 };
 
 struct cpu_map;