Re: [PATCH v5 13/13] perf stat: Use affinity for enabling/disabling events

[Jiri Olsa]

On Thu, Nov 07, 2019 at 10:16:46AM -0800, Andi Kleen wrote:

SNIP

> diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
> index 33080f79b977..571bb102b432 100644
> --- a/tools/perf/util/evlist.c
> +++ b/tools/perf/util/evlist.c
> @@ -378,11 +378,28 @@ bool evsel__cpu_iter_skip(struct evsel *ev, int cpu)
>  void evlist__disable(struct evlist *evlist)
>  {
>  	struct evsel *pos;
> +	struct affinity affinity;
> +	int cpu, i;

should we have the fallback to current code in here (and below) as well?
also for reading/openning?

jirka

> +
> +	if (affinity__setup(&affinity) < 0)
> +		return;
> +
> +	evlist__for_each_cpu (evlist, i, cpu) {
> +		affinity__set(&affinity, cpu);
>  
> +		evlist__for_each_entry(evlist, pos) {
> +			if (evsel__cpu_iter_skip(pos, cpu))
> +				continue;
> +			if (pos->disabled || !perf_evsel__is_group_leader(pos) || !pos->core.fd)
> +				continue;
> +			evsel__disable_cpu(pos, pos->cpu_iter - 1);
> +		}
> +	}
> +	affinity__cleanup(&affinity);
>  	evlist__for_each_entry(evlist, pos) {
> -		if (pos->disabled || !perf_evsel__is_group_leader(pos) || !pos->core.fd)
> +		if (!perf_evsel__is_group_leader(pos) || !pos->core.fd)
>  			continue;
> -		evsel__disable(pos);
> +		pos->disabled = true;
>  	}
>  
>  	evlist->enabled = false;
> @@ -391,11 +408,28 @@ void evlist__disable(struct evlist *evlist)
>  void evlist__enable(struct evlist *evlist)
>  {
>  	struct evsel *pos;
> +	struct affinity affinity;
> +	int cpu, i;
>  
> +	if (affinity__setup(&affinity) < 0)
> +		return;
> +
> +	evlist__for_each_cpu (evlist, i, cpu) {
> +		affinity__set(&affinity, cpu);
> +
> +		evlist__for_each_entry(evlist, pos) {
> +			if (evsel__cpu_iter_skip(pos, cpu))
> +				continue;
> +			if (!perf_evsel__is_group_leader(pos) || !pos->core.fd)
> +				continue;
> +			evsel__enable_cpu(pos, pos->cpu_iter - 1);
> +		}
> +	}
> +	affinity__cleanup(&affinity);
>  	evlist__for_each_entry(evlist, pos) {
>  		if (!perf_evsel__is_group_leader(pos) || !pos->core.fd)
>  			continue;
> -		evsel__enable(pos);
> +		pos->disabled = false;
>  	}
>  
>  	evlist->enabled = true;
> -- 
> 2.23.0
>