Commit-ID: 52c86bca94b42239563b1510d5fc6329b0ec1a86 Gitweb: https://git.kernel.org/tip/52c86bca94b42239563b1510d5fc6329b0ec1a86 Author: Jiri Olsa <jo...@kernel.org> AuthorDate: Sun, 21 Jul 2019 13:23:54 +0200 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Mon, 29 Jul 2019 18:34:42 -0300
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: Jiri Olsa <jo...@kernel.org> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: Alexey Budankov <alexey.budan...@linux.intel.com> Cc: Andi Kleen <a...@linux.intel.com> Cc: Michael Petlan <mpet...@redhat.com> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Link: http://lkml.kernel.org/r/20190721112506.12306-8-jo...@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/evlist.c | 6 +++--- tools/perf/util/evlist.h | 4 ++-- tools/perf/util/python.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index c234fa4ba92a..4fcd55c8a8d5 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -41,8 +41,8 @@ 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, - struct perf_thread_map *threads) +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; } diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 54f1c3e2b721..d6a3fa461566 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -68,8 +68,8 @@ 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, - struct perf_thread_map *threads); +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); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index f6fe3c90828f..ade4e85c6d81 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -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; }
