perf mmap: Remove overwrite from arguments list of perf_mmap__push (ca6a9a05) · Commits · 戴 / test

tools/perf/builtin-record.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);