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

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

libperf: Adopt perf_evsel__enable()/disable()/apply_filter() functions 



Move the following functions:

  evsel__enable()
  evsel__disable()
  evsel__apply_filter()

to libperf with the following names:

  perf_evsel__enable()
  perf_evsel__disable()
  perf_evsel__apply_filter()

Export only perf_evsel__enable()/disable(), keeping the
perf_evsel__apply_filter() one private for the moment.

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-66-jolsa@kernel.org


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

tools/perf/lib/evsel.c

+36 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <internal/threadmap.h>

#include <internal/lib.h>

#include <linux/string.h>

#include <sys/ioctl.h>



void perf_evsel__init(struct perf_evsel *evsel, struct perf_event_attr *attr)

{
@@ -179,3 +180,38 @@ int perf_evsel__read(struct perf_evsel *evsel, int cpu, int thread, 


	return 0;

}



static int perf_evsel__run_ioctl(struct perf_evsel *evsel,

				 int ioc,  void *arg)

{

	int cpu, 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);



			if (err)

				return err;

		}

	}



	return 0;

}



int perf_evsel__enable(struct perf_evsel *evsel)

{

	return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_ENABLE, 0);

}



int perf_evsel__disable(struct perf_evsel *evsel)

{

	return perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_DISABLE, 0);

}



int perf_evsel__apply_filter(struct perf_evsel *evsel, const char *filter)

{

	return perf_evsel__run_ioctl(evsel,

				     PERF_EVENT_IOC_SET_FILTER,

				     (void *)filter);

}

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

+1 −0
Original line number Diff line number Diff line
@@ -24,5 +24,6 @@ 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);

int perf_evsel__read_size(struct perf_evsel *evsel);

int perf_evsel__apply_filter(struct perf_evsel *evsel, const char *filter);



#endif /* __LIBPERF_INTERNAL_EVSEL_H */

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

+2 −0
Original line number Diff line number Diff line
@@ -30,5 +30,7 @@ LIBPERF_API int perf_evsel__open(struct perf_evsel *evsel, struct perf_cpu_map * 
LIBPERF_API void perf_evsel__close(struct perf_evsel *evsel);

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);

LIBPERF_API int perf_evsel__disable(struct perf_evsel *evsel);



#endif /* __LIBPERF_EVSEL_H */

tools/perf/lib/libperf.map

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ LIBPERF_0.0.1 { 
		perf_thread_map__put;

		perf_evsel__new;

		perf_evsel__delete;

		perf_evsel__enable;

		perf_evsel__disable;

		perf_evsel__init;

		perf_evsel__open;

		perf_evsel__close;

tools/perf/util/evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ int perf_evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel) 
		 * filters only work for tracepoint event, which doesn't have cpu limit.

		 * So evlist and evsel should always be same.

		 */

		err = evsel__apply_filter(evsel, evsel->filter);

		err = perf_evsel__apply_filter(&evsel->core, evsel->filter);

		if (err) {

			*err_evsel = evsel;

			break;