[PATCH v3 3/7] perf evsel: Add iterator to iterate over events ordered by CPU

Andi Kleen
2019-10-25T18:14:38Z

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>

---

v2: Add cpumap__for_each_cpu macro to factor out some common code
---
tools/perf/util/cpumap.h | 8 ++++++++
tools/perf/util/evlist.c | 33 +++++++++++++++++++++++++++++++++
tools/perf/util/evlist.h | 4 ++++
tools/perf/util/evsel.h | 1 +
4 files changed, 46 insertions(+)

diff --git a/tools/perf/util/cpumap.h b/tools/perf/util/cpumap.h
index 2553bef1279d..a9b13d72fd29 100644
--- a/tools/perf/util/cpumap.h
+++ b/tools/perf/util/cpumap.h
@@ -60,4 +60,12 @@ int cpu_map__build_map(struct perf_cpu_map *cpus, struct perf_cpu_map **res,

int cpu_map__cpu(struct perf_cpu_map *cpus, int idx);
bool cpu_map__has(struct perf_cpu_map *cpus, int cpu);
+
+#define __cpumap__for_each_cpu(cpus, index, cpu, maxcpu)\
+ for ((index) = 0; \
+ (cpu) = (index) < (maxcpu) ? (cpus)->map[index] : -1, (index) < (maxcpu); \
+ (index)++)
+#define cpumap__for_each_cpu(cpus, index, cpu) \
+ __cpumap__for_each_cpu(cpus, index, cpu, (cpus)->nr)
+
#endif /* __PERF_CPUMAP_H */
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index fdce590d2278..da3c8f8ef68e 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -342,6 +342,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