Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 144b9a4f authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Remove evlist->overwrite 



evlist->overwrite is set to false in all users. It can be removed.

Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarNamhyung 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-4-wangnan0@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7a276ff6

tools/perf/builtin-record.c

+1 −1
Original line number Original line 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;

		struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap;





		if (maps[i].base) {

		if (maps[i].base) {

			if (perf_mmap__push(&maps[i], evlist->overwrite, backward, rec, record__pushfn) != 0) {

			if (perf_mmap__push(&maps[i], false, backward, rec, record__pushfn) != 0) {

				rc = -1;

				rc = -1;

				goto out;

				goto out;

			}

			}

tools/perf/util/evlist.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -711,7 +711,7 @@ union perf_event *perf_evlist__mmap_read_forward(struct perf_evlist *evlist, int 
	 * No need for read-write ring buffer: kernel stop outputting when

	 * No need for read-write ring buffer: kernel stop outputting when

	 * it hit md->prev (perf_mmap__consume()).

	 * it hit md->prev (perf_mmap__consume()).

	 */

	 */

	return perf_mmap__read_forward(md, evlist->overwrite);

	return perf_mmap__read_forward(md, false);

}

}





union perf_event *perf_evlist__mmap_read_backward(struct perf_evlist *evlist, int idx)

union perf_event *perf_evlist__mmap_read_backward(struct perf_evlist *evlist, int idx)
@@ -738,7 +738,7 @@ void perf_evlist__mmap_read_catchup(struct perf_evlist *evlist, int idx) 




void perf_evlist__mmap_consume(struct perf_evlist *evlist, int idx)

void perf_evlist__mmap_consume(struct perf_evlist *evlist, int idx)

{

{

	perf_mmap__consume(&evlist->mmap[idx], evlist->overwrite);

	perf_mmap__consume(&evlist->mmap[idx], false);

}

}





static void perf_evlist__munmap_nofree(struct perf_evlist *evlist)

static void perf_evlist__munmap_nofree(struct perf_evlist *evlist)
@@ -1070,7 +1070,6 @@ int perf_evlist__mmap_ex(struct perf_evlist *evlist, unsigned int pages, 
	if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0)

	if (evlist->pollfd.entries == NULL && perf_evlist__alloc_pollfd(evlist) < 0)

		return -ENOMEM;

		return -ENOMEM;





	evlist->overwrite = false;

	evlist->mmap_len = perf_evlist__mmap_size(pages);

	evlist->mmap_len = perf_evlist__mmap_size(pages);

	pr_debug("mmap size %zuB\n", evlist->mmap_len);

	pr_debug("mmap size %zuB\n", evlist->mmap_len);

	mp.mask = evlist->mmap_len - page_size - 1;

	mp.mask = evlist->mmap_len - page_size - 1;

tools/perf/util/evlist.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ struct perf_evlist { 
	int		 nr_entries;

	int		 nr_entries;

	int		 nr_groups;

	int		 nr_groups;

	int		 nr_mmaps;

	int		 nr_mmaps;

	bool		 overwrite;

	bool		 enabled;

	bool		 enabled;

	bool		 has_user_cpus;

	bool		 has_user_cpus;

	size_t		 mmap_len;

	size_t		 mmap_len;