lkml.org 
[lkml]   [2017]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 4/8] perf tools: Remove overwrite from arguments list of perf_mmap__push
    Date
    'overwrite' argument is always 'false'. Revmove it from arguments
    list of perf_mmap__push.

    Signed-off-by: Wang Nan <wangnan0@huawei.com>
    ---
    tools/perf/builtin-record.c | 2 +-
    tools/perf/util/mmap.c | 6 +++---
    tools/perf/util/mmap.h | 2 +-
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
    index 3bc6cee..26b8571 100644
    --- a/tools/perf/builtin-record.c
    +++ b/tools/perf/builtin-record.c
    @@ -500,7 +500,7 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli
    struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap;

    if (maps[i].base) {
    - if (perf_mmap__push(&maps[i], false, backward, rec, record__pushfn) != 0) {
    + if (perf_mmap__push(&maps[i], backward, rec, record__pushfn) != 0) {
    rc = -1;
    goto out;
    }
    diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
    index 9fe5f9c..703ed41 100644
    --- a/tools/perf/util/mmap.c
    +++ b/tools/perf/util/mmap.c
    @@ -299,7 +299,7 @@ static int rb_find_range(void *data, int mask, u64 head, u64 old,
    return backward_rb_find_range(data, mask, head, start, end);
    }

    -int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward,
    +int perf_mmap__push(struct perf_mmap *md, bool backward,
    void *to, int push(void *to, void *buf, size_t size))
    {
    u64 head = perf_mmap__read_head(md);
    @@ -321,7 +321,7 @@ int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward,
    WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n");

    md->prev = head;
    - perf_mmap__consume(md, overwrite || backward);
    + perf_mmap__consume(md, backward);
    return 0;
    }

    @@ -346,7 +346,7 @@ int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward,
    }

    md->prev = head;
    - perf_mmap__consume(md, overwrite || backward);
    + perf_mmap__consume(md, backward);
    out:
    return rc;
    }
    diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
    index efd78b8..2c3d291 100644
    --- a/tools/perf/util/mmap.h
    +++ b/tools/perf/util/mmap.h
    @@ -89,7 +89,7 @@ static inline void perf_mmap__write_tail(struct perf_mmap *md, u64 tail)
    union perf_event *perf_mmap__read_forward(struct perf_mmap *map, bool check_messup);
    union perf_event *perf_mmap__read_backward(struct perf_mmap *map);

    -int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward,
    +int perf_mmap__push(struct perf_mmap *md, bool backward,
    void *to, int push(void *to, void *buf, size_t size));

    size_t perf_mmap__mmap_len(struct perf_mmap *map);
    --
    2.10.1
    \
     
     \ /
      Last update: 2017-12-03 03:04    [W:4.348 / U:0.168 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site