perf evlist: Rename perf_evlist__delete() to evlist__delete()
Rename perf_evlist__delete() to evlist__delete(), so we don't have a name clash when we add perf_evlist__delete() 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-10-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
0f98b11c61
commit
c12995a554
@@ -150,6 +150,6 @@ int test__backward_ring_buffer(struct test *test __maybe_unused, int subtest __m
|
||||
|
||||
ret = TEST_OK;
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return ret;
|
||||
}
|
||||
|
@@ -200,7 +200,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
|
||||
ret = TEST_OK;
|
||||
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@@ -658,7 +658,7 @@ static int do_test_code_reading(bool try_kcore)
|
||||
cpu_map__get(cpus);
|
||||
thread_map__get(threads);
|
||||
perf_evlist__set_maps(evlist, NULL, NULL);
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
evlist = NULL;
|
||||
continue;
|
||||
}
|
||||
@@ -703,7 +703,7 @@ out_put:
|
||||
out_err:
|
||||
|
||||
if (evlist) {
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
} else {
|
||||
cpu_map__put(cpus);
|
||||
thread_map__put(threads);
|
||||
|
@@ -204,7 +204,7 @@ static int test_times(int (attach)(struct evlist *),
|
||||
count.ena, count.run);
|
||||
|
||||
out_err:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return !err ? TEST_OK : TEST_FAIL;
|
||||
}
|
||||
|
||||
|
@@ -60,7 +60,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)
|
||||
}
|
||||
}
|
||||
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names)
|
||||
}
|
||||
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@@ -731,7 +731,7 @@ int test__hists_cumulate(struct test *test __maybe_unused, int subtest __maybe_u
|
||||
|
||||
out:
|
||||
/* tear down everything */
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
machines__exit(&machines);
|
||||
|
||||
return err;
|
||||
|
@@ -321,7 +321,7 @@ int test__hists_filter(struct test *test __maybe_unused, int subtest __maybe_unu
|
||||
|
||||
out:
|
||||
/* tear down everything */
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
reset_output_field();
|
||||
machines__exit(&machines);
|
||||
|
||||
|
@@ -334,7 +334,7 @@ int test__hists_link(struct test *test __maybe_unused, int subtest __maybe_unuse
|
||||
|
||||
out:
|
||||
/* tear down everything */
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
reset_output_field();
|
||||
machines__exit(&machines);
|
||||
|
||||
|
@@ -618,7 +618,7 @@ int test__hists_output(struct test *test __maybe_unused, int subtest __maybe_unu
|
||||
|
||||
out:
|
||||
/* tear down everything */
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
machines__exit(&machines);
|
||||
|
||||
return err;
|
||||
|
@@ -147,7 +147,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
|
||||
out_err:
|
||||
if (evlist) {
|
||||
perf_evlist__disable(evlist);
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
} else {
|
||||
cpu_map__put(cpus);
|
||||
thread_map__put(threads);
|
||||
|
@@ -151,7 +151,7 @@ out_init:
|
||||
}
|
||||
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
cpus = NULL;
|
||||
threads = NULL;
|
||||
out_free_cpus:
|
||||
|
@@ -134,7 +134,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
|
||||
out_ok:
|
||||
err = 0;
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
out:
|
||||
return err;
|
||||
}
|
||||
|
@@ -1790,7 +1790,7 @@ static int test_event(struct evlist_test *e)
|
||||
ret = e->check(evlist);
|
||||
}
|
||||
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@@ -46,7 +46,7 @@ static int process_events(union perf_event **events, size_t count)
|
||||
for (i = 0; i < count && !err; i++)
|
||||
err = process_event(&evlist, events[i]);
|
||||
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
@@ -325,7 +325,7 @@ found_exit:
|
||||
++errs;
|
||||
}
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
out:
|
||||
return (err < 0 || errs > 0) ? -1 : 0;
|
||||
}
|
||||
|
@@ -128,7 +128,7 @@ out_free_maps:
|
||||
cpu_map__put(cpus);
|
||||
thread_map__put(threads);
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return err;
|
||||
}
|
||||
|
||||
|
@@ -567,7 +567,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
|
||||
out:
|
||||
if (evlist) {
|
||||
perf_evlist__disable(evlist);
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
} else {
|
||||
cpu_map__put(cpus);
|
||||
thread_map__put(threads);
|
||||
|
@@ -138,6 +138,6 @@ out_free_maps:
|
||||
cpu_map__put(cpus);
|
||||
thread_map__put(threads);
|
||||
out_delete_evlist:
|
||||
perf_evlist__delete(evlist);
|
||||
evlist__delete(evlist);
|
||||
return err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user