Commit 99d6141d authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

perf evsel: Add functions to close evsel on a CPU 



Refactor the existing all CPU function to use the per CPU close
internally.

Export APIs to close per CPU.

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lore.kernel.org/lkml/20191121001522.180827-7-andi@firstfloor.org


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

tools/perf/lib/evsel.c

+21 −6
Original line number Diff line number Diff line
@@ -114,11 +114,10 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus, 
	return err;

}



void perf_evsel__close_fd(struct perf_evsel *evsel)

static void perf_evsel__close_fd_cpu(struct perf_evsel *evsel, 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) {

		if (FD(evsel, cpu, thread) >= 0)

			close(FD(evsel, cpu, thread));
@@ -126,6 +125,14 @@ void perf_evsel__close_fd(struct perf_evsel *evsel) 
	}

}



void perf_evsel__close_fd(struct perf_evsel *evsel)

{

	int cpu;



	for (cpu = 0; cpu < xyarray__max_x(evsel->fd); cpu++)

		perf_evsel__close_fd_cpu(evsel, cpu);

}



void perf_evsel__free_fd(struct perf_evsel *evsel)

{

	xyarray__delete(evsel->fd);
@@ -141,6 +148,14 @@ void perf_evsel__close(struct perf_evsel *evsel) 
	perf_evsel__free_fd(evsel);

}



void perf_evsel__close_cpu(struct perf_evsel *evsel, int cpu)

{

	if (evsel->fd == NULL)

		return;



	perf_evsel__close_fd_cpu(evsel, cpu);

}



int perf_evsel__read_size(struct perf_evsel *evsel)

{

	u64 read_format = evsel->attr.read_format;

tools/perf/lib/include/perf/evsel.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ LIBPERF_API void perf_evsel__delete(struct perf_evsel *evsel); 
LIBPERF_API int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus,

				 struct perf_thread_map *threads);

LIBPERF_API void perf_evsel__close(struct perf_evsel *evsel);

LIBPERF_API void perf_evsel__close_cpu(struct perf_evsel *evsel, int cpu);

LIBPERF_API int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread,

				 struct perf_counts_values *count);

LIBPERF_API int perf_evsel__enable(struct perf_evsel *evsel);

CRA Git | Maintained and supported by SUSTech CRA and CCSE