lkml.org 
[lkml]   [2019]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 21/73] libperf: Move mmap_len from struct evlist to struct perf_evlist
    Date
    Moving mmap_len from struct evlist to struct perf_evlist
    it will be used in following patches.

    Link: http://lkml.kernel.org/n/tip-0md597ojq254vdemewxrmukh@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/builtin-record.c | 2 +-
    tools/perf/lib/include/internal/evlist.h | 1 +
    tools/perf/util/evlist.c | 10 +++++-----
    tools/perf/util/evlist.h | 1 -
    4 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index 6e9f5619f062..68091f3773a8 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -1407,7 +1407,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
    err = -1;
    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();
    if (err) {
    diff --git a/tools/perf/lib/include/internal/evlist.h b/tools/perf/lib/include/internal/evlist.h
    index 035c1e1cc324..01b813616440 100644
    --- a/tools/perf/lib/include/internal/evlist.h
    +++ b/tools/perf/lib/include/internal/evlist.h
    @@ -14,6 +14,7 @@ struct perf_evlist {
    struct perf_cpu_map *cpus;
    struct perf_thread_map *threads;
    int nr_mmaps;
    + size_t mmap_len;
    };

    /**
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index 891052570e73..07f02afa3407 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -1011,11 +1011,11 @@ int evlist__mmap_ex(struct evlist *evlist, unsigned int pages,
    if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0)
    return -ENOMEM;

    - evlist->mmap_len = evlist__mmap_size(pages);
    - pr_debug("mmap size %zuB\n", evlist->mmap_len);
    - mp.mask = evlist->mmap_len - page_size - 1;
    + evlist->core.mmap_len = evlist__mmap_size(pages);
    + pr_debug("mmap size %zuB\n", evlist->core.mmap_len);
    + 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);

    evlist__for_each_entry(evlist, evsel) {
    @@ -1599,7 +1599,7 @@ int perf_evlist__strerror_open(struct evlist *evlist,
    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));
    - 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) {
    case EPERM:
    diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
    index 4c465b4aced8..3767866e98c1 100644
    --- a/tools/perf/util/evlist.h
    +++ b/tools/perf/util/evlist.h
    @@ -28,7 +28,6 @@ struct evlist {
    struct hlist_head heads[PERF_EVLIST__HLIST_SIZE];
    int nr_groups;
    bool enabled;
    - size_t mmap_len;
    int id_pos;
    int is_pos;
    u64 combined_sample_type;
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-09-13 15:29    [W:4.902 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site