Commit-ID: b4b62ee688eb39151c9d8182c3e2f12c9d34602d Gitweb: https://git.kernel.org/tip/b4b62ee688eb39151c9d8182c3e2f12c9d34602d Author: Jiri Olsa <jo...@kernel.org> AuthorDate: Sun, 21 Jul 2019 13:23:53 +0200 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Mon, 29 Jul 2019 18:34:42 -0300
perf evsel: Rename perf_evsel__init() to evsel__init() Rename perf_evsel__init() to evsel__init(), so we don't have a name clash when we add perf_evsel__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-7-jo...@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/perf/util/evsel.c | 8 ++++---- tools/perf/util/evsel.h | 3 +-- tools/perf/util/python.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f7f97ca6e96d..97bee83f0f98 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -223,8 +223,8 @@ bool perf_evsel__is_function_event(struct evsel *evsel) #undef FUNCTION_EVENT } -void perf_evsel__init(struct evsel *evsel, - struct perf_event_attr *attr, int idx) +void evsel__init(struct evsel *evsel, + struct perf_event_attr *attr, int idx) { evsel->idx = idx; evsel->tracking = !idx; @@ -255,7 +255,7 @@ struct evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx) if (!evsel) return NULL; - perf_evsel__init(evsel, attr, idx); + evsel__init(evsel, attr, idx); if (perf_evsel__is_bpf_output(evsel)) { evsel->attr.sample_type |= (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | @@ -350,7 +350,7 @@ struct evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx) event_attr_init(&attr); attr.config = evsel->tp_format->id; attr.sample_period = 1; - perf_evsel__init(evsel, &attr, idx); + evsel__init(evsel, &attr, idx); } return evsel; diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 3caabd8a4aa6..af230d92fbef 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -238,8 +238,7 @@ struct evsel *perf_evsel__new_cycles(bool precise); struct tep_event *event_format__new(const char *sys, const char *name); -void perf_evsel__init(struct evsel *evsel, - struct perf_event_attr *attr, int idx); +void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int idx); void perf_evsel__exit(struct evsel *evsel); void perf_evsel__delete(struct evsel *evsel); diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index ed57b6b5ed91..f6fe3c90828f 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -782,7 +782,7 @@ static int pyrf_evsel__init(struct pyrf_evsel *pevsel, attr.sample_id_all = sample_id_all; attr.size = sizeof(attr); - perf_evsel__init(&pevsel->evsel, &attr, idx); + evsel__init(&pevsel->evsel, &attr, idx); return 0; }
