diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/perf/util/evsel.h | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/perf/util/evsel.h')
-rw-r--r-- | tools/perf/util/evsel.h | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 1ea7c92..4a7bdc7 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -74,7 +74,10 @@ struct perf_evsel { off_t id_offset; }; struct cgroup_sel *cgrp; - void *handler; + struct { + void *func; + void *data; + } handler; struct cpu_map *cpus; unsigned int sample_size; int id_pos; @@ -96,19 +99,8 @@ struct thread_map; struct perf_evlist; struct perf_record_opts; -struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx); - -static inline struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr) -{ - return perf_evsel__new_idx(attr, 0); -} - -struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx); - -static inline struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name) -{ - return perf_evsel__newtp_idx(sys, name, 0); -} +struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx); +struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name, int idx); struct event_format *event_format__new(const char *sys, const char *name); @@ -205,12 +197,6 @@ static inline bool perf_evsel__match2(struct perf_evsel *e1, (e1->attr.config == e2->attr.config); } -#define perf_evsel__cmp(a, b) \ - ((a) && \ - (b) && \ - (a)->attr.type == (b)->attr.type && \ - (a)->attr.config == (b)->attr.config) - int __perf_evsel__read_on_cpu(struct perf_evsel *evsel, int cpu, int thread, bool scale); @@ -279,11 +265,6 @@ static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel) return list_entry(evsel->node.next, struct perf_evsel, node); } -static inline struct perf_evsel *perf_evsel__prev(struct perf_evsel *evsel) -{ - return list_entry(evsel->node.prev, struct perf_evsel, node); -} - /** * perf_evsel__is_group_leader - Return whether given evsel is a leader event * @@ -323,7 +304,8 @@ int perf_evsel__fprintf(struct perf_evsel *evsel, bool perf_evsel__fallback(struct perf_evsel *evsel, int err, char *msg, size_t msgsize); -int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target, +int perf_evsel__open_strerror(struct perf_evsel *evsel, + struct perf_target *target, int err, char *msg, size_t size); static inline int perf_evsel__group_idx(struct perf_evsel *evsel) |