diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2019-07-21 13:23:57 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-07-29 18:34:43 -0300 |
| commit | 5eb2dd2ade8354dcbe4cef54cd1719622af8f2dc (patch) | |
| tree | e045fe91d294213ceb9fbf4e7e7e7ab1be8dff05 /tools/perf/util | |
| parent | c12995a55474e1cefac52da38c7fc47c024de067 (diff) | |
perf evsel: Rename perf_evsel__delete() to evsel__delete()
Remame perf_evsel__delete() to evsel__delete(), so we don't have a name
clash when we add perf_evsel__delete() in libperf.
Also renaming perf_evsel__delete_priv() to evsel__delete_priv().
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-11-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 | 4 | ||||
| -rw-r--r-- | tools/perf/util/evsel.c | 4 | ||||
| -rw-r--r-- | tools/perf/util/evsel.h | 2 | ||||
| -rw-r--r-- | tools/perf/util/parse-events.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 9fa3663068b4..986d20c15778 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -121,7 +121,7 @@ static void perf_evlist__purge(struct evlist *evlist) evlist__for_each_entry_safe(evlist, n, pos) { list_del_init(&pos->node); pos->evlist = NULL; - perf_evsel__delete(pos); + evsel__delete(pos); } evlist->nr_entries = 0; @@ -277,7 +277,7 @@ static int perf_evlist__add_attrs(struct evlist *evlist, out_delete_partial_list: __evlist__for_each_entry_safe(&head, n, evsel) - perf_evsel__delete(evsel); + evsel__delete(evsel); return -1; } diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 97bee83f0f98..de379b63f1ce 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -316,7 +316,7 @@ new_event: out: return evsel; error_free: - perf_evsel__delete(evsel); + evsel__delete(evsel); evsel = NULL; goto out; } @@ -1333,7 +1333,7 @@ void perf_evsel__exit(struct evsel *evsel) perf_evsel__object.fini(evsel); } -void perf_evsel__delete(struct evsel *evsel) +void evsel__delete(struct evsel *evsel) { perf_evsel__exit(evsel); free(evsel); diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index af230d92fbef..20b4e31b63a9 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -240,7 +240,7 @@ struct tep_event *event_format__new(const char *sys, const char *name); 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); +void evsel__delete(struct evsel *evsel); struct callchain_param; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 6a4bfc7ab0c1..cc63367f6e45 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -662,7 +662,7 @@ static int add_bpf_event(const char *group, const char *event, int fd, struct bp group, event); list_for_each_entry_safe(evsel, tmp, &new_evsels, node) { list_del_init(&evsel->node); - perf_evsel__delete(evsel); + evsel__delete(evsel); } return err; } @@ -2334,7 +2334,7 @@ static bool is_event_supported(u8 type, unsigned config) evsel->attr.exclude_kernel = 1; ret = perf_evsel__open(evsel, NULL, tmap) >= 0; } - perf_evsel__delete(evsel); + evsel__delete(evsel); } thread_map__put(tmap); |