[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20240823113306.2310957-6-leo.yan@arm.com>
Date: Fri, 23 Aug 2024 12:33:03 +0100
From: Leo Yan <leo.yan@....com>
To: Peter Zijlstra <peterz@...radead.org>,
Adrian Hunter <adrian.hunter@...el.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Jiri Olsa <jolsa@...nel.org>,
Ian Rogers <irogers@...gle.com>,
"Liang, Kan" <kan.liang@...ux.intel.com>,
Suzuki K Poulose <suzuki.poulose@....com>,
Mike Leach <mike.leach@...aro.org>,
James Clark <james.clark@...aro.org>,
John Garry <john.g.garry@...cle.com>,
Will Deacon <will@...nel.org>,
Yicong Yang <yangyicong@...ilicon.com>,
Jonathan Cameron <jonathan.cameron@...wei.com>,
linux-perf-users@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
coresight@...ts.linaro.org
Cc: Leo Yan <leo.yan@....com>
Subject: [PATCH v6 5/8] perf auxtrace: Refactor evlist__enable_event_idx()
This commit splits the evlist__enable_event_idx() function into two
steps. The first step uses a new function evlist__find_cpu_map_idx() to
find the CPU map index, based on the found CPU map index or a thread map
index, it continues to call evlist__enable_event_idx() for enabling the
corresponding event.
Signed-off-by: Leo Yan <leo.yan@....com>
---
tools/perf/util/auxtrace.c | 42 +++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 10 deletions(-)
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 87e4f21b6edf..e7b582d92811 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -651,20 +651,30 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr,
return -EINVAL;
}
-static int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx)
+static int evlist__find_cpu_map_idx(struct evlist *evlist, struct evsel *evsel,
+ int idx)
{
bool per_cpu_mmaps = !perf_cpu_map__has_any_cpu(evlist->core.user_requested_cpus);
+ struct perf_cpu evlist_cpu;
+ int cpu_map_idx;
- if (per_cpu_mmaps) {
- struct perf_cpu evlist_cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
- int cpu_map_idx = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
+ if (!per_cpu_mmaps)
+ return -EINVAL;
- if (cpu_map_idx == -1)
- return -EINVAL;
- return perf_evsel__enable_cpu(&evsel->core, cpu_map_idx);
- }
+ evlist_cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
+ cpu_map_idx = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
+ if (cpu_map_idx == -1)
+ return -ENOENT;
+
+ return cpu_map_idx;
+}
- return perf_evsel__enable_thread(&evsel->core, idx);
+static int evlist__enable_event_idx(struct evsel *evsel, int cpu_mode, int idx)
+{
+ if (cpu_mode)
+ return perf_evsel__enable_cpu(&evsel->core, idx);
+ else
+ return perf_evsel__enable_thread(&evsel->core, idx);
}
int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx)
@@ -676,9 +686,21 @@ int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx)
evlist__for_each_entry(itr->evlist, evsel) {
if (evsel__is_aux_event(evsel)) {
+ int cpu_map_idx;
+
if (evsel->disabled)
return 0;
- return evlist__enable_event_idx(itr->evlist, evsel, idx);
+
+ cpu_map_idx = evlist__find_cpu_map_idx(itr->evlist,
+ evsel, idx);
+ /* No map is found in per CPU mmap */
+ if (cpu_map_idx == -ENOENT)
+ return cpu_map_idx;
+
+ if (cpu_map_idx >= 0)
+ return evlist__enable_event_idx(evsel, 1, cpu_map_idx);
+ else
+ return evlist__enable_event_idx(evsel, 0, idx);
}
}
return -EINVAL;
--
2.34.1
Powered by blists - more mailing lists