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

Commit a5830532 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Rename 'struct perf_mmap' to 'struct mmap' 



Rename 'struct perf_evlist' to 'struct evlist', so we don't have a name
clash when we add 'struct perf_mmap' to libperf.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lore.kernel.org/lkml/20190913132355.21634-4-jolsa@kernel.org


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

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe 
	union perf_event *event;

	u64 test_tsc, comm1_tsc, comm2_tsc;

	u64 test_time, comm1_time = 0, comm2_time = 0;

	struct perf_mmap *md;

	struct mmap *md;



	threads = thread_map__new(-1, getpid(), UINT_MAX);

	CHECK_NOT_NULL__(threads);

tools/perf/builtin-kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx, 
{

	struct evlist *evlist = kvm->evlist;

	union perf_event *event;

	struct perf_mmap *md;

	struct mmap *md;

	u64 timestamp;

	s64 n = 0;

	int err;

tools/perf/builtin-record.c

+17 −17
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static bool switch_output_time(struct record *rec) 
	       trigger_is_ready(&switch_output_trigger);

}



static int record__write(struct record *rec, struct perf_mmap *map __maybe_unused,

static int record__write(struct record *rec, struct mmap *map __maybe_unused,

			 void *bf, size_t size)

{

	struct perf_data_file *file = &rec->session->data->file;
@@ -168,7 +168,7 @@ static int record__aio_write(struct aiocb *cblock, int trace_fd, 
	return rc;

}



static int record__aio_complete(struct perf_mmap *md, struct aiocb *cblock)

static int record__aio_complete(struct mmap *md, struct aiocb *cblock)

{

	void *rem_buf;

	off_t rem_off;
@@ -214,7 +214,7 @@ static int record__aio_complete(struct perf_mmap *md, struct aiocb *cblock) 
	return rc;

}



static int record__aio_sync(struct perf_mmap *md, bool sync_all)

static int record__aio_sync(struct mmap *md, bool sync_all)

{

	struct aiocb **aiocb = md->aio.aiocb;

	struct aiocb *cblocks = md->aio.cblocks;
@@ -255,7 +255,7 @@ struct record_aio { 
	size_t		size;

};



static int record__aio_pushfn(struct perf_mmap *map, void *to, void *buf, size_t size)

static int record__aio_pushfn(struct mmap *map, void *to, void *buf, size_t size)

{

	struct record_aio *aio = to;
@@ -300,7 +300,7 @@ static int record__aio_pushfn(struct perf_mmap *map, void *to, void *buf, size_t 
	return size;

}



static int record__aio_push(struct record *rec, struct perf_mmap *map, off_t *off)

static int record__aio_push(struct record *rec, struct mmap *map, off_t *off)

{

	int ret, idx;

	int trace_fd = rec->session->data->file.fd;
@@ -351,13 +351,13 @@ static void record__aio_mmap_read_sync(struct record *rec) 
{

	int i;

	struct evlist *evlist = rec->evlist;

	struct perf_mmap *maps = evlist->mmap;

	struct mmap *maps = evlist->mmap;



	if (!record__aio_enabled(rec))

		return;



	for (i = 0; i < evlist->nr_mmaps; i++) {

		struct perf_mmap *map = &maps[i];

		struct mmap *map = &maps[i];



		if (map->base)

			record__aio_sync(map, true);
@@ -387,7 +387,7 @@ static int record__aio_parse(const struct option *opt, 
#else /* HAVE_AIO_SUPPORT */

static int nr_cblocks_max = 0;



static int record__aio_push(struct record *rec __maybe_unused, struct perf_mmap *map __maybe_unused,

static int record__aio_push(struct record *rec __maybe_unused, struct mmap *map __maybe_unused,

			    off_t *off __maybe_unused)

{

	return -1;
@@ -482,7 +482,7 @@ static int process_synthesized_event(struct perf_tool *tool, 
	return record__write(rec, NULL, event, event->header.size);

}



static int record__pushfn(struct perf_mmap *map, void *to, void *bf, size_t size)

static int record__pushfn(struct mmap *map, void *to, void *bf, size_t size)

{

	struct record *rec = to;
@@ -527,7 +527,7 @@ static void record__sig_exit(void) 
#ifdef HAVE_AUXTRACE_SUPPORT



static int record__process_auxtrace(struct perf_tool *tool,

				    struct perf_mmap *map,

				    struct mmap *map,

				    union perf_event *event, void *data1,

				    size_t len1, void *data2, size_t len2)

{
@@ -565,7 +565,7 @@ static int record__process_auxtrace(struct perf_tool *tool, 
}



static int record__auxtrace_mmap_read(struct record *rec,

				      struct perf_mmap *map)

				      struct mmap *map)

{

	int ret;
@@ -581,7 +581,7 @@ static int record__auxtrace_mmap_read(struct record *rec, 
}



static int record__auxtrace_mmap_read_snapshot(struct record *rec,

					       struct perf_mmap *map)

					       struct mmap *map)

{

	int ret;
@@ -603,7 +603,7 @@ static int record__auxtrace_read_snapshot_all(struct record *rec) 
	int rc = 0;



	for (i = 0; i < rec->evlist->nr_mmaps; i++) {

		struct perf_mmap *map = &rec->evlist->mmap[i];

		struct mmap *map = &rec->evlist->mmap[i];



		if (!map->auxtrace_mmap.base)

			continue;
@@ -668,7 +668,7 @@ static int record__auxtrace_init(struct record *rec) 


static inline

int record__auxtrace_mmap_read(struct record *rec __maybe_unused,

			       struct perf_mmap *map __maybe_unused)

			       struct mmap *map __maybe_unused)

{

	return 0;

}
@@ -901,7 +901,7 @@ static struct perf_event_header finished_round_event = { 
	.type = PERF_RECORD_FINISHED_ROUND,

};



static void record__adjust_affinity(struct record *rec, struct perf_mmap *map)

static void record__adjust_affinity(struct record *rec, struct mmap *map)

{

	if (rec->opts.affinity != PERF_AFFINITY_SYS &&

	    !CPU_EQUAL(&rec->affinity_mask, &map->affinity_mask)) {
@@ -948,7 +948,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist, 
	u64 bytes_written = rec->bytes_written;

	int i;

	int rc = 0;

	struct perf_mmap *maps;

	struct mmap *maps;

	int trace_fd = rec->data.file.fd;

	off_t off = 0;
@@ -967,7 +967,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist, 


	for (i = 0; i < evlist->nr_mmaps; i++) {

		u64 flush = 0;

		struct perf_mmap *map = &maps[i];

		struct mmap *map = &maps[i];



		if (map->base) {

			record__adjust_affinity(rec, map);

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx) 
{

	struct record_opts *opts = &top->record_opts;

	struct evlist *evlist = top->evlist;

	struct perf_mmap *md;

	struct mmap *md;

	union perf_event *event;



	md = opts->overwrite ? &evlist->overwrite_mmap[idx] : &evlist->mmap[idx];

tools/perf/builtin-trace.c

+1 −1
Original line number Diff line number Diff line
@@ -3444,7 +3444,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 


	for (i = 0; i < evlist->nr_mmaps; i++) {

		union perf_event *event;

		struct perf_mmap *md;

		struct mmap *md;



		md = &evlist->mmap[i];

		if (perf_mmap__read_init(md) < 0)