Re: [PATCH V2 03/23] perf evlist: Use libperf functions in evlist__enable_event_idx()

[Arnaldo Carvalho de Melo <acme@kernel.org>]

Em Fri, May 06, 2022 at 03:25:41PM +0300, Adrian Hunter escreveu:
> evlist__enable_event_idx() is used only for auxtrace events which are never
> system_wide. Simplify by using libperf enable event functions.
> 
> Acked-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>

Thanks, applied.

- Arnaldo

> ---
>  tools/perf/util/evlist.c | 44 ++--------------------------------------
>  1 file changed, 2 insertions(+), 42 deletions(-)
> 
> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 52ea004ba01e..9fcecf7daa62 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -334,14 +334,6 @@ int evlist__add_newtp(struct evlist *evlist, const char *sys, const char *name,
>  	return 0;
>  }
>  
> -static int evlist__nr_threads(struct evlist *evlist, struct evsel *evsel)
> -{
> -	if (evsel->core.system_wide)
> -		return 1;
> -	else
> -		return perf_thread_map__nr(evlist->core.threads);
> -}
> -
>  struct evlist_cpu_iterator evlist__cpu_begin(struct evlist *evlist, struct affinity *affinity)
>  {
>  	struct evlist_cpu_iterator itr = {
> @@ -546,46 +538,14 @@ void evlist__toggle_enable(struct evlist *evlist)
>  	(evlist->enabled ? evlist__disable : evlist__enable)(evlist);
>  }
>  
> -static int evlist__enable_event_cpu(struct evlist *evlist, struct evsel *evsel, int cpu)
> -{
> -	int thread;
> -	int nr_threads = evlist__nr_threads(evlist, evsel);
> -
> -	if (!evsel->core.fd)
> -		return -EINVAL;
> -
> -	for (thread = 0; thread < nr_threads; thread++) {
> -		int err = ioctl(FD(evsel, cpu, thread), PERF_EVENT_IOC_ENABLE, 0);
> -		if (err)
> -			return err;
> -	}
> -	return 0;
> -}
> -
> -static int evlist__enable_event_thread(struct evlist *evlist, struct evsel *evsel, int thread)
> -{
> -	int cpu;
> -	int nr_cpus = perf_cpu_map__nr(evlist->core.user_requested_cpus);
> -
> -	if (!evsel->core.fd)
> -		return -EINVAL;
> -
> -	for (cpu = 0; cpu < nr_cpus; cpu++) {
> -		int err = ioctl(FD(evsel, cpu, thread), PERF_EVENT_IOC_ENABLE, 0);
> -		if (err)
> -			return err;
> -	}
> -	return 0;
> -}
> -
>  int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx)
>  {
>  	bool per_cpu_mmaps = !perf_cpu_map__empty(evlist->core.user_requested_cpus);
>  
>  	if (per_cpu_mmaps)
> -		return evlist__enable_event_cpu(evlist, evsel, idx);
> +		return perf_evsel__enable_cpu(&evsel->core, idx);
>  
> -	return evlist__enable_event_thread(evlist, evsel, idx);
> +	return perf_evsel__enable_thread(&evsel->core, idx);
>  }
>  
>  int evlist__add_pollfd(struct evlist *evlist, int fd)
> -- 
> 2.25.1

-- 

- Arnaldo