xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libperf: Adopt perf_evsel__alloc_fd() function from tools/perf

Browse Source 
Move the perf_evsel__alloc_fd() function from perf to libperf.

It's not exported.

Signed-off-by: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2019-07-21 13:24:48 +02:00
committed by Arnaldo Carvalho de Melo
parent c03538b1f1
commit b8eca4d761
3 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/perf/lib/evsel.c
View File

@@ -1,9 +1,12 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <errno.h>
#include <perf/evsel.h> #include <perf/evsel.h>
#include <linux/list.h> #include <linux/list.h>
#include <internal/evsel.h> #include <internal/evsel.h>
#include <linux/zalloc.h> #include <linux/zalloc.h>
#include <stdlib.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) 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); 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;
}

2
tools/perf/lib/include/internal/evsel.h
View File

@@ -20,4 +20,6 @@ struct perf_evsel {
int nr_members; int nr_members;
}; };
int perf_evsel__alloc_fd(struct perf_evsel *evsel, int ncpus, int nthreads);
#endif /* __LIBPERF_INTERNAL_EVSEL_H */ #endif /* __LIBPERF_INTERNAL_EVSEL_H */

18
tools/perf/util/evsel.c
View File

@@ -1153,22 +1153,6 @@ void perf_evsel__config(struct evsel *evsel, struct record_opts *opts,
perf_evsel__reset_sample_bit(evsel, BRANCH_STACK); 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, static int perf_evsel__run_ioctl(struct evsel *evsel,
int ioc, void *arg) int ioc, void *arg)
{ {
@@ -1866,7 +1850,7 @@ int evsel__open(struct evsel *evsel, struct perf_cpu_map *cpus,
nthreads = threads->nr; nthreads = threads->nr;
if (evsel->core.fd == NULL && 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; return -ENOMEM;
if (evsel->cgrp) { if (evsel->cgrp) {