| Message ID | 20240823113306.2310957-7-leo.yan@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | perf auxtrace: Support multiple AUX events | expand |
On 23/08/24 14:33, Leo Yan wrote: > After finding the corresponding event for the passed buffer index, it is > safe to say the found event has been used. Then, the tool can check the > event status and bails out if it has been disabled. I don't really understand why this is a separate patch. Maybe it should be merged with the next one? > > Signed-off-by: Leo Yan <leo.yan@arm.com> > --- > tools/perf/util/auxtrace.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c > index e7b582d92811..2acf63efab1d 100644 > --- a/tools/perf/util/auxtrace.c > +++ b/tools/perf/util/auxtrace.c > @@ -688,15 +688,15 @@ int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx) > if (evsel__is_aux_event(evsel)) { > int cpu_map_idx; > > - if (evsel->disabled) > - return 0; > - > 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 (evsel->disabled) > + return 0; > + > if (cpu_map_idx >= 0) > return evlist__enable_event_idx(evsel, 1, cpu_map_idx); > else
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index e7b582d92811..2acf63efab1d 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -688,15 +688,15 @@ int auxtrace_record__read_finish(struct auxtrace_record *itr, int idx) if (evsel__is_aux_event(evsel)) { int cpu_map_idx; - if (evsel->disabled) - return 0; - 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 (evsel->disabled) + return 0; + if (cpu_map_idx >= 0) return evlist__enable_event_idx(evsel, 1, cpu_map_idx); else
After finding the corresponding event for the passed buffer index, it is safe to say the found event has been used. Then, the tool can check the event status and bails out if it has been disabled. Signed-off-by: Leo Yan <leo.yan@arm.com> --- tools/perf/util/auxtrace.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)