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

perf evlist: Rename perf_evlist__init() to evlist__init() 



Rename perf_evlist__init() to evlist__init(), so we don't have a name
clash when we add perf_evlist__init() in libperf.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20190721112506.12306-8-jolsa@kernel.org


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

tools/perf/util/evlist.c

+3 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ int sigqueue(pid_t pid, int sig, const union sigval value); 
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))

#define SID(e, x, y) xyarray__entry(e->sample_id, x, y)



void perf_evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,

void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,

		  struct perf_thread_map *threads)

{

	int i;
@@ -60,7 +60,7 @@ struct evlist *perf_evlist__new(void) 
	struct evlist *evlist = zalloc(sizeof(*evlist));



	if (evlist != NULL)

		perf_evlist__init(evlist, NULL, NULL);

		evlist__init(evlist, NULL, NULL);



	return evlist;

}

tools/perf/util/evlist.h

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ struct evsel_str_handler { 
struct evlist *perf_evlist__new(void);

struct evlist *perf_evlist__new_default(void);

struct evlist *perf_evlist__new_dummy(void);

void perf_evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,

void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus,

		  struct perf_thread_map *threads);

void perf_evlist__exit(struct evlist *evlist);

void perf_evlist__delete(struct evlist *evlist);

tools/perf/util/python.c

+1 −1
Original line number Diff line number Diff line
@@ -873,7 +873,7 @@ static int pyrf_evlist__init(struct pyrf_evlist *pevlist, 


	threads = ((struct pyrf_thread_map *)pthreads)->threads;

	cpus = ((struct pyrf_cpu_map *)pcpus)->cpus;

	perf_evlist__init(&pevlist->evlist, cpus, threads);

	evlist__init(&pevlist->evlist, cpus, threads);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE