[PATCH v2 5/9] perf evsel: Add iterator to iterate over events ordered by CPU

Andi Kleen
2019-10-20T17:52:36Z

From: Andi Kleen <ak@linux.intel.com>

Add some common code that is needed to iterate over all events
in CPU order. Used in followon patches

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
tools/perf/util/evlist.c | 33 +++++++++++++++++++++++++++++++++
tools/perf/util/evlist.h | 4 ++++
tools/perf/util/evsel.h | 1 +
3 files changed, 38 insertions(+)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 21b77efa802c..27b4b958eddd 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -341,6 +341,39 @@ static int perf_evlist__nr_threads(struct evlist *evlist,
return perf_thread_map__nr(evlist->core.threads);
}

+struct perf_cpu_map *evlist__cpu_iter_start(struct evlist *evlist)
+{
+ struct perf_cpu_map *cpus;
+ struct evsel *pos;
+
+ /*
+ * evlist->cpus is not necessarily a superset of all the
+ * event's cpus, so compute our own super set. This
+ * assume that there is a super set
+ */
+ cpus = evlist->core.cpus;
+ evlist__for_each_entry(evlist, pos) {
+ pos->cpu_index = 0;
+ if (pos->core.cpus->nr > cpus->nr)
+ cpus = pos->core.cpus;
+ }
+ return cpus;
+}
+
+bool evlist__cpu_iter_skip(struct evsel *ev, int cpu)
+{
+ if (ev->cpu_index >= ev->core.cpus->nr)
+ return true;
+ if (cpu >= 0 && ev->core.cpus->map[ev->cpu_index] != cpu)
+ return true;
+ return false;
+}
+
+void evlist__cpu_iter_next(struct evsel *ev)
+{
+ ev->cpu_index++;
+}
+
void evlist__disable(struct evlist *evlist)
{
struct evsel *pos;
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 13051409fd22..c1deb8ebdcea 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -336,6 +336,10 @@ void perf_evlist__to_front(struct evlist *evlist,
void perf_evlist__set_tracking_event(struct evlist *evlist,
struct evsel *tracking_evsel);

+struct perf_cpu_map *evlist__cpu_iter_start(struct evlist *evlist);
+bool evlist__cpu_iter_skip(struct evsel *ev, int cpu);
+void evlist__cpu_iter_next(struct evsel *ev);
+
struct evsel *
perf_evlist__find_evsel_by_str(struct evlist *evlist, const char *str);

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index ddc5ee6f6592..cf90019ae744 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -95,6 +95,7 @@ struct evsel {
bool collect_stat;
bool weak_group;
bool percore;
+ int cpu_index;
const char *pmu_name;
struct {
perf_evsel__sb_cb_t *cb;
--
2.21.0