Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88761fa1 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

libperf: Adopt simplified perf_evsel__close() function from tools/perf 



Add perf_evsel__close() function to libperf while keeping a tools/perf
specific evsel__close() to free ids.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-64-jolsa@kernel.org


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

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -2401,7 +2401,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel, 


			if (evsel->max_events != ULONG_MAX && ++evsel->nr_events_printed == evsel->max_events) {

				evsel__disable(evsel);

				perf_evsel__close(evsel);

				evsel__close(evsel);

			}

		}

	}

tools/perf/lib/evsel.c

+26 −0
Original line number Diff line number Diff line
@@ -111,3 +111,29 @@ int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map *cpus, 


	return err;

}



void perf_evsel__close_fd(struct perf_evsel *evsel)

{

	int cpu, thread;



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

		for (thread = 0; thread < xyarray__max_y(evsel->fd); ++thread) {

			close(FD(evsel, cpu, thread));

			FD(evsel, cpu, thread) = -1;

		}

}



void perf_evsel__free_fd(struct perf_evsel *evsel)

{

	xyarray__delete(evsel->fd);

	evsel->fd = NULL;

}



void perf_evsel__close(struct perf_evsel *evsel)

{

	if (evsel->fd == NULL)

		return;



	perf_evsel__close_fd(evsel);

	perf_evsel__free_fd(evsel);

}

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

+2 −0
Original line number Diff line number Diff line
@@ -21,5 +21,7 @@ struct perf_evsel { 
};



int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);

void perf_evsel__close_fd(struct perf_evsel *evsel);

void perf_evsel__free_fd(struct perf_evsel *evsel);



#endif /* __LIBPERF_INTERNAL_EVSEL_H */

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

+1 −0
Original line number Diff line number Diff line
@@ -15,5 +15,6 @@ LIBPERF_API struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr); 
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);



#endif /* __LIBPERF_EVSEL_H */

tools/perf/lib/libperf.map

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ LIBPERF_0.0.1 { 
		perf_evsel__delete;

		perf_evsel__init;

		perf_evsel__open;

		perf_evsel__close;

		perf_evlist__new;

		perf_evlist__delete;

		perf_evlist__init;