diff options
author | Jiri Olsa <jolsa@kernel.org> | 2019-07-21 07:24:34 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-29 17:34:45 -0400 |
commit | 651bf38ce10a65ef8efb901fc33187127c023e97 (patch) | |
tree | 0ed001cfe2255f31e97c423198d0b9406bf1466d /tools/perf/lib | |
parent | 63bd5dfa69658c459d08a6ee6bfebbd4a91cf24d (diff) |
libperf: Add perf_evlist__for_each_evsel() iterator
Add a perf_evlist__for_each_evsel() macro to iterate perf_evsel objects
in evlist.
Introduce the perf_evlist__next() function to do that without exposing
'struct perf_evlist' internals.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-48-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/lib')
-rw-r--r-- | tools/perf/lib/evlist.c | 20 | ||||
-rw-r--r-- | tools/perf/lib/include/perf/evlist.h | 7 | ||||
-rw-r--r-- | tools/perf/lib/libperf.map | 1 |
3 files changed, 28 insertions, 0 deletions
diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c index 0517deb4cb1c..979ee423490f 100644 --- a/tools/perf/lib/evlist.c +++ b/tools/perf/lib/evlist.c | |||
@@ -34,3 +34,23 @@ struct perf_evlist *perf_evlist__new(void) | |||
34 | 34 | ||
35 | return evlist; | 35 | return evlist; |
36 | } | 36 | } |
37 | |||
38 | struct perf_evsel * | ||
39 | perf_evlist__next(struct perf_evlist *evlist, struct perf_evsel *prev) | ||
40 | { | ||
41 | struct perf_evsel *next; | ||
42 | |||
43 | if (!prev) { | ||
44 | next = list_first_entry(&evlist->entries, | ||
45 | struct perf_evsel, | ||
46 | node); | ||
47 | } else { | ||
48 | next = list_next_entry(prev, node); | ||
49 | } | ||
50 | |||
51 | /* Empty list is noticed here so don't need checking on entry. */ | ||
52 | if (&next->node == &evlist->entries) | ||
53 | return NULL; | ||
54 | |||
55 | return next; | ||
56 | } | ||
diff --git a/tools/perf/lib/include/perf/evlist.h b/tools/perf/lib/include/perf/evlist.h index 7255a60869a1..5092b622935b 100644 --- a/tools/perf/lib/include/perf/evlist.h +++ b/tools/perf/lib/include/perf/evlist.h | |||
@@ -13,5 +13,12 @@ LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist, | |||
13 | LIBPERF_API void perf_evlist__remove(struct perf_evlist *evlist, | 13 | LIBPERF_API void perf_evlist__remove(struct perf_evlist *evlist, |
14 | struct perf_evsel *evsel); | 14 | struct perf_evsel *evsel); |
15 | LIBPERF_API struct perf_evlist *perf_evlist__new(void); | 15 | LIBPERF_API struct perf_evlist *perf_evlist__new(void); |
16 | LIBPERF_API struct perf_evsel* perf_evlist__next(struct perf_evlist *evlist, | ||
17 | struct perf_evsel *evsel); | ||
18 | |||
19 | #define perf_evlist__for_each_evsel(evlist, pos) \ | ||
20 | for ((pos) = perf_evlist__next((evlist), NULL); \ | ||
21 | (pos) != NULL; \ | ||
22 | (pos) = perf_evlist__next((evlist), (pos))) | ||
16 | 23 | ||
17 | #endif /* __LIBPERF_EVLIST_H */ | 24 | #endif /* __LIBPERF_EVLIST_H */ |
diff --git a/tools/perf/lib/libperf.map b/tools/perf/lib/libperf.map index e3eac9b60726..c0968226f7b6 100644 --- a/tools/perf/lib/libperf.map +++ b/tools/perf/lib/libperf.map | |||
@@ -17,6 +17,7 @@ LIBPERF_0.0.1 { | |||
17 | perf_evlist__init; | 17 | perf_evlist__init; |
18 | perf_evlist__add; | 18 | perf_evlist__add; |
19 | perf_evlist__remove; | 19 | perf_evlist__remove; |
20 | perf_evlist__next; | ||
20 | local: | 21 | local: |
21 | *; | 22 | *; |
22 | }; | 23 | }; |