leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libperf: Move 'mmap_len' from 'struct evlist' to 'struct perf_evlist'

Browse Source 
Moving 'mmap_len' from 'struct evlist' to 'struct perf_evlist' it will
be used in following patches.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-22-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2019-08-06 15:14:05 +02:00
committed by Arnaldo Carvalho de Melo
parent c976ee11a0
commit f6fa437577
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-record.c
View File

@@ -1412,7 +1412,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
err = -1; err = -1;
goto out_child; goto out_child;
} }
session->header.env.comp_mmap_len = session->evlist->mmap_len; session->header.env.comp_mmap_len = session->evlist->core.mmap_len;
err = bpf__apply_obj_config(); err = bpf__apply_obj_config();
if (err) { if (err) {

1
tools/perf/lib/include/internal/evlist.h
View File

@@ -14,6 +14,7 @@ struct perf_evlist {
struct perf_cpu_map *cpus; struct perf_cpu_map *cpus;
struct perf_thread_map *threads; struct perf_thread_map *threads;
int nr_mmaps; int nr_mmaps;
size_t mmap_len;
}; };
/** /**

10
tools/perf/util/evlist.c
View File

@@ -1012,11 +1012,11 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages,
if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0) if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0)
return -ENOMEM; return -ENOMEM;
evlist->mmap_len = evlist__mmap_size(pages); evlist->core.mmap_len = evlist__mmap_size(pages);
pr_debug("mmap size %zuB\n", evlist->mmap_len); pr_debug("mmap size %zuB\n", evlist->core.mmap_len);
mp.mask = evlist->mmap_len - page_size - 1; mp.mask = evlist->core.mmap_len - page_size - 1;
auxtrace_mmap_params__init(&mp.auxtrace_mp, evlist->mmap_len, auxtrace_mmap_params__init(&mp.auxtrace_mp, evlist->core.mmap_len,
auxtrace_pages, auxtrace_overwrite); auxtrace_pages, auxtrace_overwrite);
evlist__for_each_entry(evlist, evsel) { evlist__for_each_entry(evlist, evsel) {
@@ -1600,7 +1600,7 @@ out_default:
int perf_evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size) int perf_evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size)
{ {
char sbuf[STRERR_BUFSIZE], *emsg = str_error_r(err, sbuf, sizeof(sbuf)); char sbuf[STRERR_BUFSIZE], *emsg = str_error_r(err, sbuf, sizeof(sbuf));
int pages_attempted = evlist->mmap_len / 1024, pages_max_per_user, printed = 0; int pages_attempted = evlist->core.mmap_len / 1024, pages_max_per_user, printed = 0;
switch (err) { switch (err) {
case EPERM: case EPERM:

1
tools/perf/util/evlist.h
View File

@@ -56,7 +56,6 @@ struct evlist {
struct hlist_head heads[PERF_EVLIST__HLIST_SIZE]; struct hlist_head heads[PERF_EVLIST__HLIST_SIZE];
int nr_groups; int nr_groups;
bool enabled; bool enabled;
size_t mmap_len;
int id_pos; int id_pos;
int is_pos; int is_pos;
u64 combined_sample_type; u64 combined_sample_type;