perf evlist: Rename perf_evlist__disable() to evlist__disable()
Rename perf_evlist__disable() to evlist__disable(), so we don't have a name clash when we add perf_evlist__disable() 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-23-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
1c87f1654c
commit
e74676deba
@@ -70,7 +70,7 @@ static int do_test(struct evlist *evlist, int mmap_pages,
|
||||
|
||||
evlist__enable(evlist);
|
||||
testcase();
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
err = count_samples(evlist, sample_count, comm_count);
|
||||
perf_evlist__munmap(evlist);
|
||||
|
@@ -173,7 +173,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void),
|
||||
|
||||
evlist__enable(evlist);
|
||||
(*func)();
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
for (i = 0; i < evlist->nr_mmaps; i++) {
|
||||
union perf_event *event;
|
||||
|
@@ -684,7 +684,7 @@ static int do_test_code_reading(bool try_kcore)
|
||||
|
||||
do_something();
|
||||
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
ret = process_events(machine, evlist, &state);
|
||||
if (ret < 0)
|
||||
|
@@ -112,7 +112,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
|
||||
comm = "Test COMM 1";
|
||||
CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
|
||||
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
found = find_comm(evlist, comm);
|
||||
if (found != 1) {
|
||||
@@ -134,7 +134,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
|
||||
comm = "Test COMM 2";
|
||||
CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));
|
||||
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
found = find_comm(evlist, comm);
|
||||
if (found != 1) {
|
||||
@@ -146,7 +146,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
|
||||
|
||||
out_err:
|
||||
if (evlist) {
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
evlist__delete(evlist);
|
||||
} else {
|
||||
cpu_map__put(cpus);
|
||||
|
@@ -92,7 +92,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
|
||||
for (i = 0; i < NR_LOOPS; i++)
|
||||
tmp++;
|
||||
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
md = &evlist->mmap[0];
|
||||
if (perf_mmap__read_init(md) < 0)
|
||||
|
@@ -528,7 +528,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
|
||||
goto out_err;
|
||||
}
|
||||
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
|
||||
switch_tracking.switch_evsel = switch_evsel;
|
||||
switch_tracking.cycles_evsel = cycles_evsel;
|
||||
@@ -566,7 +566,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
|
||||
}
|
||||
out:
|
||||
if (evlist) {
|
||||
perf_evlist__disable(evlist);
|
||||
evlist__disable(evlist);
|
||||
evlist__delete(evlist);
|
||||
} else {
|
||||
cpu_map__put(cpus);
|
||||
|
Reference in New Issue
Block a user