perf evsel: Rename perf_evsel__disable() to evsel__disable()

Renaming perf_evsel__disable() to evsel__disable(), so we don't have a
name clash when we add perf_evsel__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-17-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/arm/util/cs-etm.c b/tools/perf/arch/arm/util/cs-etm.c
index 4b70b95046031f0cb410134d525033e8c18d9990..268fcb31cd5360337771e111e9e684909e6c5c58 100644 (file)
--- a/tools/perf/arch/arm/util/cs-etm.c
+++ b/tools/perf/arch/arm/util/cs-etm.c
@@ -821,7 +821,7 @@ static int cs_etm_snapshot_start(struct auxtrace_record *itr)
 
        evlist__for_each_entry(ptr->evlist, evsel) {
                if (evsel->attr.type == ptr->cs_etm_pmu->type)
-                       return perf_evsel__disable(evsel);
+                       return evsel__disable(evsel);
        }
        return -EINVAL;
 }

diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c
index d27832fcb34c10e115f1ca596b935a3b3f2ef9b1..8b0a53d748c9dea37312e46c9bed43b5f2c18185 100644 (file)
--- a/tools/perf/arch/x86/util/intel-bts.c
+++ b/tools/perf/arch/x86/util/intel-bts.c
@@ -317,7 +317,7 @@ static int intel_bts_snapshot_start(struct auxtrace_record *itr)
 
        evlist__for_each_entry(btsr->evlist, evsel) {
                if (evsel->attr.type == btsr->intel_bts_pmu->type)
-                       return perf_evsel__disable(evsel);
+                       return evsel__disable(evsel);
        }
        return -EINVAL;
 }

diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index e3dacb2bf01b0fc7f0be00d736d47edc4bede0ad..4ce157a4e5e207e028bd82b8189fae20cb9a6a9b 100644 (file)
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -788,7 +788,7 @@ static int intel_pt_snapshot_start(struct auxtrace_record *itr)
 
        evlist__for_each_entry(ptr->evlist, evsel) {
                if (evsel->attr.type == ptr->intel_pt_pmu->type)
-                       return perf_evsel__disable(evsel);
+                       return evsel__disable(evsel);
        }
        return -EINVAL;
 }

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 89ae4737ef747943e039495462b5107f92a76599..95ecefa9ff7e8c2eee47f3ecbad66ddd1afb832b 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -2400,7 +2400,7 @@ static int trace__event_handler(struct trace *trace, struct evsel *evsel,
                        ++trace->nr_events_printed;
 
                        if (evsel->max_events != ULONG_MAX && ++evsel->nr_events_printed == evsel->max_events) {
-                               perf_evsel__disable(evsel);
+                               evsel__disable(evsel);
                                perf_evsel__close(evsel);
                        }
                }

diff --git a/tools/perf/tests/keep-tracking.c b/tools/perf/tests/keep-tracking.c
index cdc19bcc7523200fb16afe11c03f0f2616191435..1976ccb3c8126110867c2b11b6d478f95d24cc82 100644 (file)
--- a/tools/perf/tests/keep-tracking.c
+++ b/tools/perf/tests/keep-tracking.c
@@ -129,7 +129,7 @@ int test__keep_tracking(struct test *test __maybe_unused, int subtest __maybe_un
 
        evsel = perf_evlist__last(evlist);
 
-       CHECK__(perf_evsel__disable(evsel));
+       CHECK__(evsel__disable(evsel));
 
        comm = "Test COMM 2";
        CHECK__(prctl(PR_SET_NAME, (unsigned long)comm, 0, 0, 0));

diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index acc4b5ff0cea09622a28a053f8e414fd8972b142..5662dc1c6bd3845c919d44fad0977c3f572fbdad 100644 (file)
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -464,7 +464,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
 
        perf_evlist__enable(evlist);
 
-       err = perf_evsel__disable(cpu_clocks_evsel);
+       err = evsel__disable(cpu_clocks_evsel);
        if (err) {
                pr_debug("perf_evlist__disable_event failed!\n");
                goto out_err;
@@ -483,7 +483,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
                goto out_err;
        }
 
-       err = perf_evsel__disable(cycles_evsel);
+       err = evsel__disable(cycles_evsel);
        if (err) {
                pr_debug("perf_evlist__disable_event failed!\n");
                goto out_err;

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index e87c43e339d019928fac27fc04689d1c899231a6..9461583c53d9355325b31fad5087af37d3cd6c0e 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -350,7 +350,7 @@ void perf_evlist__disable(struct evlist *evlist)
        evlist__for_each_entry(evlist, pos) {
                if (pos->disabled || !perf_evsel__is_group_leader(pos) || !pos->fd)
                        continue;
-               perf_evsel__disable(pos);
+               evsel__disable(pos);
        }
 
        evlist->enabled = false;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 7adae1736191f6bf8b88aa186271d54f53b31ea1..855d286298ebf07363ba686751cc01732d2405b3 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1244,7 +1244,7 @@ int evsel__enable(struct evsel *evsel)
        return err;
 }
 
-int perf_evsel__disable(struct evsel *evsel)
+int evsel__disable(struct evsel *evsel)
 {
        int err = perf_evsel__run_ioctl(evsel, PERF_EVENT_IOC_DISABLE, 0);
        /*

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index fa26c583a606fc0eec452ca0dac6e5e05ee29713..c338ce14e8aac9285a617b05a223350352dd42a0 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -296,7 +296,7 @@ int perf_evsel__append_addr_filter(struct evsel *evsel,
                                   const char *filter);
 int perf_evsel__apply_filter(struct evsel *evsel, const char *filter);
 int evsel__enable(struct evsel *evsel);
-int perf_evsel__disable(struct evsel *evsel);
+int evsel__disable(struct evsel *evsel);
 
 int perf_evsel__open_per_cpu(struct evsel *evsel,
                             struct perf_cpu_map *cpus);