perf evlist: Use the right prefix for 'struct evlist' event selection methods

perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c
index cb9c0c85dc8fcf12fbf26926d19c4bf84f7d9cd4..a6420c64795974b42cd7bc80660209136be42d0f 100644 (file)
--- a/tools/perf/arch/x86/util/intel-pt.c
+++ b/tools/perf/arch/x86/util/intel-pt.c
@@ -416,7 +416,7 @@ static int intel_pt_track_switches(struct evlist *evlist)
        struct evsel *evsel;
        int err;
 
-       if (!perf_evlist__can_select_event(evlist, sched_switch))
+       if (!evlist__can_select_event(evlist, sched_switch))
                return -EPERM;
 
        err = parse_events(evlist, sched_switch, NULL);

diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index e07fe84bb3040ad82672335cbd2df39acfc750b4..a4cf5ee22c28aa8019de295de53d179c82ef2df9 100644 (file)
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -380,7 +380,7 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
        cycles_evsel = evlist__last(evlist);
 
        /* Third event */
-       if (!perf_evlist__can_select_event(evlist, sched_switch)) {
+       if (!evlist__can_select_event(evlist, sched_switch)) {
                pr_debug("No sched_switch\n");
                err = 0;
                goto out;

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 766be504abca4cbef5e8cef0198fad085075a0d4..3b9818ee9546a53222e38389677c7f52837bd17a 100644 (file)
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -3494,7 +3494,7 @@ static int perf_evsel_menu__run(struct evsel_menu *menu,
                                continue;
                        pos = menu->selection;
 browse_hists:
-                       perf_evlist__set_selected(evlist, pos);
+                       evlist__set_selected(evlist, pos);
                        /*
                         * Give the calling tool a chance to populate the non
                         * default evsel resorted hists tree.

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 869195b6f21c4d486fd8eece72ff236816c56c2f..a11364d9472082407cc6042c5b6a740969b7bbe6 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1183,8 +1183,7 @@ bool evlist__sample_id_all(struct evlist *evlist)
        return first->core.attr.sample_id_all;
 }
 
-void perf_evlist__set_selected(struct evlist *evlist,
-                              struct evsel *evsel)
+void evlist__set_selected(struct evlist *evlist, struct evsel *evsel)
 {
        evlist->selected = evsel;
 }

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index d09970e7c838e4135f66ab14510325d63bc926a2..e858a351b01424883aae583ae4d19e3dfc47b3bf 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -192,8 +192,7 @@ void evlist__toggle_enable(struct evlist *evlist);
 
 int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel, int idx);
 
-void perf_evlist__set_selected(struct evlist *evlist,
-                              struct evsel *evsel);
+void evlist__set_selected(struct evlist *evlist, struct evsel *evsel);
 
 int evlist__create_maps(struct evlist *evlist, struct target *target);
 int evlist__apply_filters(struct evlist *evlist, struct evsel **err_evsel);
@@ -238,7 +237,7 @@ static inline struct evsel *evlist__last(struct evlist *evlist)
 int evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_t size);
 int evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size);
 
-bool perf_evlist__can_select_event(struct evlist *evlist, const char *str);
+bool evlist__can_select_event(struct evlist *evlist, const char *str);
 void evlist__to_front(struct evlist *evlist, struct evsel *move_evsel);
 
 /**

diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
index 220b9910427bb0d39a8e34e3d5ed88d846a172c8..f72c8e05e15ce81845c7e68ad4064f123f39d280 100644 (file)
--- a/tools/perf/util/record.c
+++ b/tools/perf/util/record.c
@@ -217,7 +217,7 @@ int record_opts__config(struct record_opts *opts)
        return record_opts__config_freq(opts);
 }
 
-bool perf_evlist__can_select_event(struct evlist *evlist, const char *str)
+bool evlist__can_select_event(struct evlist *evlist, const char *str)
 {
        struct evlist *temp_evlist;
        struct evsel *evsel;