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

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

libperf: Adopt perf_evsel__alloc_fd() function from tools/perf 



Move the perf_evsel__alloc_fd() function from perf to libperf.

It's not exported.

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


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

tools/perf/lib/evsel.c

+21 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <errno.h>

#include <perf/evsel.h>

#include <linux/list.h>

#include <internal/evsel.h>

#include <linux/zalloc.h>

#include <stdlib.h>

#include <internal/xyarray.h>

#include <linux/string.h>



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

{
@@ -25,3 +28,21 @@ void perf_evsel__delete(struct perf_evsel *evsel) 
{

	free(evsel);

}



#define FD(e, x, y) (*(int *) xyarray__entry(e->fd, x, y))



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

{

	evsel->fd = xyarray__new(ncpus, nthreads, sizeof(int));



	if (evsel->fd) {

		int cpu, thread;

		for (cpu = 0; cpu < ncpus; cpu++) {

			for (thread = 0; thread < nthreads; thread++) {

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

			}

		}

	}



	return evsel->fd != NULL ? 0 : -ENOMEM;

}

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

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ struct perf_evsel { 
	int			 nr_members;

};



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



#endif /* __LIBPERF_INTERNAL_EVSEL_H */

tools/perf/util/evsel.c

+1 −17
Original line number Diff line number Diff line
@@ -1153,22 +1153,6 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts, 
		perf_evsel__reset_sample_bit(evsel, BRANCH_STACK);

}



static int perf_evsel__alloc_fd(struct evsel *evsel, int ncpus, int nthreads)

{

	evsel->core.fd = xyarray__new(ncpus, nthreads, sizeof(int));



	if (evsel->core.fd) {

		int cpu, thread;

		for (cpu = 0; cpu < ncpus; cpu++) {

			for (thread = 0; thread < nthreads; thread++) {

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

			}

		}

	}



	return evsel->core.fd != NULL ? 0 : -ENOMEM;

}



static int perf_evsel__run_ioctl(struct evsel *evsel,

			  int ioc,  void *arg)

{
@@ -1866,7 +1850,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus, 
		nthreads = threads->nr;



	if (evsel->core.fd == NULL &&

	    perf_evsel__alloc_fd(evsel, cpus->nr, nthreads) < 0)

	    perf_evsel__alloc_fd(&evsel->core, cpus->nr, nthreads) < 0)

		return -ENOMEM;



	if (evsel->cgrp) {