diff options
author | Jiri Olsa <jolsa@kernel.org> | 2019-07-21 13:23:55 +0200 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-29 18:34:43 -0300 |
commit | 0f98b11c616f240b54ee85629ff4d3650c7ccc7d (patch) | |
tree | a4e66783cfb096a70ac999213cc59a92266521d4 /tools/perf/util | |
parent | 52c86bca94b42239563b1510d5fc6329b0ec1a86 (diff) | |
download | lwn-0f98b11c616f240b54ee85629ff4d3650c7ccc7d.tar.gz lwn-0f98b11c616f240b54ee85629ff4d3650c7ccc7d.zip |
perf evlist: Rename perf_evlist__new() to evlist__new()
Rename perf_evlist__new() to evlist__new(), so we don't have a name
clash when we add perf_evlist__new() in libperf.
Signed-off-by: Jiri 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-9-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r-- | tools/perf/util/evlist.c | 8 | ||||
-rw-r--r-- | tools/perf/util/evlist.h | 2 | ||||
-rw-r--r-- | tools/perf/util/header.c | 4 | ||||
-rw-r--r-- | tools/perf/util/record.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 4fcd55c8a8d5..317b2d64ba6d 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -55,7 +55,7 @@ void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, evlist->bkw_mmap_state = BKW_MMAP_NOTREADY; } -struct evlist *perf_evlist__new(void) +struct evlist *evlist__new(void) { struct evlist *evlist = zalloc(sizeof(*evlist)); @@ -67,7 +67,7 @@ struct evlist *perf_evlist__new(void) struct evlist *perf_evlist__new_default(void) { - struct evlist *evlist = perf_evlist__new(); + struct evlist *evlist = evlist__new(); if (evlist && perf_evlist__add_default(evlist)) { perf_evlist__delete(evlist); @@ -79,7 +79,7 @@ struct evlist *perf_evlist__new_default(void) struct evlist *perf_evlist__new_dummy(void) { - struct evlist *evlist = perf_evlist__new(); + struct evlist *evlist = evlist__new(); if (evlist && perf_evlist__add_dummy(evlist)) { perf_evlist__delete(evlist); @@ -1839,7 +1839,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist, bool new_evlist = (*evlist) == NULL; if (*evlist == NULL) - *evlist = perf_evlist__new(); + *evlist = evlist__new(); if (*evlist == NULL) return -1; diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index d6a3fa461566..60e1c9268e9e 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -65,7 +65,7 @@ struct evsel_str_handler { void *handler; }; -struct evlist *perf_evlist__new(void); +struct evlist *evlist__new(void); struct evlist *perf_evlist__new_default(void); struct evlist *perf_evlist__new_dummy(void); void evlist__init(struct evlist *evlist, struct perf_cpu_map *cpus, diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 692fe8ac12ae..5b90786a8436 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3535,7 +3535,7 @@ int perf_session__read_header(struct perf_session *session) int nr_attrs, nr_ids, i, j; int fd = perf_data__fd(data); - session->evlist = perf_evlist__new(); + session->evlist = evlist__new(); if (session->evlist == NULL) return -ENOMEM; @@ -4016,7 +4016,7 @@ int perf_event__process_attr(struct perf_tool *tool __maybe_unused, struct evlist *evlist = *pevlist; if (evlist == NULL) { - *pevlist = evlist = perf_evlist__new(); + *pevlist = evlist = evlist__new(); if (evlist == NULL) return -ENOMEM; } diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index a550d78a0b4d..a23c69137dfc 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -19,7 +19,7 @@ static int perf_do_probe_api(setup_probe_fn_t fn, int cpu, const char *str) int err = -EAGAIN, fd; static pid_t pid = -1; - evlist = perf_evlist__new(); + evlist = evlist__new(); if (!evlist) return -ENOMEM; @@ -264,7 +264,7 @@ bool perf_evlist__can_select_event(struct evlist *evlist, const char *str) bool ret = false; pid_t pid = -1; - temp_evlist = perf_evlist__new(); + temp_evlist = evlist__new(); if (!temp_evlist) return false; |