Commit a40bb751 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Use libperf functions in evlist__enable_event_idx() 



evlist__enable_event_idx() is used only for auxtrace events which are never
system_wide. Simplify by using libperf enable event functions.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20220506122601.367589-4-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 00632610

tools/perf/util/evlist.c

+2 −42
Original line number Diff line number Diff line
@@ -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)