Re: [PATCH v4 9/9] perf stat: Use affinity for enabling/disabling events

[Jiri Olsa]

On Mon, Nov 04, 2019 at 04:25:22PM -0800, Andi Kleen wrote:

SNIP

>  }
>  
>  static int perf_evsel__run_ioctl(struct perf_evsel *evsel,
> -				 int ioc,  void *arg)
> +				 int ioc,  void *arg,
> +				 int cpu)
>  {
> -	int cpu, thread;
> +	int thread;
>  
> -	for (cpu = 0; cpu < xyarray__max_x(evsel->fd); cpu++) {
> -		for (thread = 0; thread < xyarray__max_y(evsel->fd); thread++) {
> -			int fd = FD(evsel, cpu, thread),
> -			    err = ioctl(fd, ioc, arg);
> +	for (thread = 0; thread < xyarray__max_y(evsel->fd); thread++) {
> +		int fd = FD(evsel, cpu, thread),
> +		    err = ioctl(fd, ioc, arg);
>  
> -			if (err)
> -				return err;
> -		}
> +		if (err)
> +			return err;
>  	}
>  
>  	return 0;
>  }
>  
> +int perf_evsel__enable_cpu(struct perf_evsel *evsel, int cpu)
> +{
> +	return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_ENABLE, 0, cpu);
> +}
> +
>  int perf_evsel__enable(struct perf_evsel *evsel)
>  {
> -	return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_ENABLE, 0);
> +	int i;
> +	int err = 0;
> +
> +	for (i = 0; i < evsel->cpus->nr && !err; i++)
> +		err = perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_ENABLE, 0, i);
> +	return err;
> +}
> +
> +int perf_evsel__disable_cpu(struct perf_evsel *evsel, int cpu)
> +{
> +	return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_DISABLE, 0, cpu);
>  }
>  
>  int perf_evsel__disable(struct perf_evsel *evsel)
>  {
> -	return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_DISABLE, 0);
> +	int i;
> +	int err = 0;
> +
> +	for (i = 0; i < evsel->cpus->nr && !err; i++)
> +		err = perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_DISABLE, 0, i);
> +	return err;
>  }
>  
>  int perf_evsel__apply_filter(struct perf_evsel *evsel, const char *filter)
>  {
> -	return perf_evsel__run_ioctl(evsel,
> +	int err = 0, i;
> +
> +	for (i = 0; i < evsel->cpus->nr && !err; i++)
> +		err = perf_evsel__run_ioctl(evsel,
>  				     PERF_EVENT_IOC_SET_FILTER,
> -				     (void *)filter);
> +				     (void *)filter, i);
> +	return err;
>  }

please move the new function additions to separate patches

thanks,
jirka