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>

diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c
index 0517deb4cb1c7453bc98ce47b7687c0d38c7b64e..979ee423490f1a7afd85b518f44cc502cf52d027 100644 (file)
--- a/tools/perf/lib/evlist.c
+++ b/tools/perf/lib/evlist.c
@@ -34,3 +34,23 @@ struct perf_evlist *perf_evlist__new(void)
 
        return evlist;
 }
+
+struct perf_evsel *
+perf_evlist__next(struct perf_evlist *evlist, struct perf_evsel *prev)
+{
+       struct perf_evsel *next;
+
+       if (!prev) {
+               next = list_first_entry(&evlist->entries,
+                                       struct perf_evsel,
+                                       node);
+       } else {
+               next = list_next_entry(prev, node);
+       }
+
+       /* Empty list is noticed here so don't need checking on entry. */
+       if (&next->node == &evlist->entries)
+               return NULL;
+
+       return next;
+}

diff --git a/tools/perf/lib/include/perf/evlist.h b/tools/perf/lib/include/perf/evlist.h
index 7255a60869a18321d53429158635bead9627873f..5092b622935b21d1d4423cad9cbbf041939cc16e 100644 (file)
--- 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,
 LIBPERF_API void perf_evlist__remove(struct perf_evlist *evlist,
                                     struct perf_evsel *evsel);
 LIBPERF_API struct perf_evlist *perf_evlist__new(void);
+LIBPERF_API struct perf_evsel* perf_evlist__next(struct perf_evlist *evlist,
+                                                struct perf_evsel *evsel);
+
+#define perf_evlist__for_each_evsel(evlist, pos)       \
+       for ((pos) = perf_evlist__next((evlist), NULL); \
+            (pos) != NULL;                             \
+            (pos) = perf_evlist__next((evlist), (pos)))
 
 #endif /* __LIBPERF_EVLIST_H */

diff --git a/tools/perf/lib/libperf.map b/tools/perf/lib/libperf.map
index e3eac9b607264a096401d31e40884fa29f934795..c0968226f7b6cde1adcb5b60673ba53ea13318ca 100644 (file)
--- a/tools/perf/lib/libperf.map
+++ b/tools/perf/lib/libperf.map
@@ -17,6 +17,7 @@ LIBPERF_0.0.1 {
                perf_evlist__init;
                perf_evlist__add;
                perf_evlist__remove;
+               perf_evlist__next;
        local:
                *;
 };