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 12/73] libperf: Add fd to struct perf_mmap
    Date
    Move fd from tools/perf's mmap to libperf's perf_mmap struct.

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

    diff --git a/tools/perf/lib/include/internal/mmap.h b/tools/perf/lib/include/internal/mmap.h
    index a6a464097f14..2cbe2c463c0a 100644
    --- a/tools/perf/lib/include/internal/mmap.h
    +++ b/tools/perf/lib/include/internal/mmap.h
    @@ -15,6 +15,7 @@
    struct perf_mmap {
    void *base;
    int mask;
    + int fd;
    };

    #endif /* __LIBPERF_INTERNAL_MMAP_H */
    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index ac738b90a71f..57b117532ade 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -651,7 +651,7 @@ static int perf_evlist__set_paused(struct evlist *evlist, bool value)
    return 0;

    for (i = 0; i < evlist->nr_mmaps; i++) {
    - int fd = evlist->overwrite_mmap[i].fd;
    + int fd = evlist->overwrite_mmap[i].core.fd;
    int err;

    if (fd < 0)
    @@ -707,7 +707,7 @@ static struct mmap *evlist__alloc_mmap(struct evlist *evlist,
    return NULL;

    for (i = 0; i < evlist->nr_mmaps; i++) {
    - map[i].fd = -1;
    + map[i].core.fd = -1;
    map[i].overwrite = overwrite;
    /*
    * When the perf_mmap() call is made we grab one refcount, plus
    diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
    index 702e8e0b90ea..40bf124cb658 100644
    --- a/tools/perf/util/mmap.c
    +++ b/tools/perf/util/mmap.c
    @@ -320,7 +320,7 @@ void perf_mmap__munmap(struct mmap *map)
    if (map->core.base != NULL) {
    munmap(map->core.base, perf_mmap__mmap_len(map));
    map->core.base = NULL;
    - map->fd = -1;
    + map->core.fd = -1;
    refcount_set(&map->refcnt, 0);
    }
    auxtrace_mmap__munmap(&map->auxtrace_mmap);
    @@ -378,7 +378,7 @@ int perf_mmap__mmap(struct mmap *map, struct mmap_params *mp, int fd, int cpu)
    map->core.base = NULL;
    return -1;
    }
    - map->fd = fd;
    + map->core.fd = fd;
    map->cpu = cpu;

    perf_mmap__setup_affinity_mask(map, mp);
    diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
    index a6e60596f889..6eb7a4c6b14a 100644
    --- a/tools/perf/util/mmap.h
    +++ b/tools/perf/util/mmap.h
    @@ -22,7 +22,6 @@ struct aiocb;
    */
    struct mmap {
    struct perf_mmap core;
    - int fd;
    int cpu;
    refcount_t refcnt;
    u64 prev;
    --
    2.21.0
    \
     
     \ /
      Last update: 2019-09-13 15:25    [W:4.122 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site