aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2017-12-02 21:00:40 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2017-12-05 13:43:54 -0500
commitca6a9a05391960be5e8161a59a9854b32325d901 (patch)
tree09ee62d65d19304ce5885849fed4add184bbb1ed
parent144b9a4fc53039c09007b71a06640560a6e62140 (diff)
perf mmap: Remove overwrite from arguments list of perf_mmap__push
'overwrite' argument is always 'false'. Remove it from arguments list of perf_mmap__push(). Signed-off-by: Wang Nan <wangnan0@huawei.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Kan Liang <kan.liang@intel.com> Link: http://lkml.kernel.org/r/20171203020044.81680-5-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/builtin-record.c2
-rw-r--r--tools/perf/util/mmap.c6
-rw-r--r--tools/perf/util/mmap.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 3bc6ceeae1f9..26b8571d0fdb 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
500 struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap; 500 struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap;
501 501
502 if (maps[i].base) { 502 if (maps[i].base) {
503 if (perf_mmap__push(&maps[i], false, backward, rec, record__pushfn) != 0) { 503 if (perf_mmap__push(&maps[i], backward, rec, record__pushfn) != 0) {
504 rc = -1; 504 rc = -1;
505 goto out; 505 goto out;
506 } 506 }
diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
index 9fe5f9c7d577..703ed41a9269 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,
299 return backward_rb_find_range(data, mask, head, start, end); 299 return backward_rb_find_range(data, mask, head, start, end);
300} 300}
301 301
302int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward, 302int perf_mmap__push(struct perf_mmap *md, bool backward,
303 void *to, int push(void *to, void *buf, size_t size)) 303 void *to, int push(void *to, void *buf, size_t size))
304{ 304{
305 u64 head = perf_mmap__read_head(md); 305 u64 head = perf_mmap__read_head(md);
@@ -321,7 +321,7 @@ int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward,
321 WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n"); 321 WARN_ONCE(1, "failed to keep up with mmap data. (warn only once)\n");
322 322
323 md->prev = head; 323 md->prev = head;
324 perf_mmap__consume(md, overwrite || backward); 324 perf_mmap__consume(md, backward);
325 return 0; 325 return 0;
326 } 326 }
327 327
@@ -346,7 +346,7 @@ int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward,
346 } 346 }
347 347
348 md->prev = head; 348 md->prev = head;
349 perf_mmap__consume(md, overwrite || backward); 349 perf_mmap__consume(md, backward);
350out: 350out:
351 return rc; 351 return rc;
352} 352}
diff --git a/tools/perf/util/mmap.h b/tools/perf/util/mmap.h
index efd78b827b05..2c3d291785de 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)
89union perf_event *perf_mmap__read_forward(struct perf_mmap *map, bool check_messup); 89union perf_event *perf_mmap__read_forward(struct perf_mmap *map, bool check_messup);
90union perf_event *perf_mmap__read_backward(struct perf_mmap *map); 90union perf_event *perf_mmap__read_backward(struct perf_mmap *map);
91 91
92int perf_mmap__push(struct perf_mmap *md, bool overwrite, bool backward, 92int perf_mmap__push(struct perf_mmap *md, bool backward,
93 void *to, int push(void *to, void *buf, size_t size)); 93 void *to, int push(void *to, void *buf, size_t size));
94 94
95size_t perf_mmap__mmap_len(struct perf_mmap *map); 95size_t perf_mmap__mmap_len(struct perf_mmap *map);