perf evlist: Use the right prefix for 'struct evlist' 'toggle' 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/builtin-record.c b/tools/perf/builtin-record.c
index 4302f32c80c59889c7d65bff1fba72b3ab6bff46..d0e3dd57c108e36c962f69bd530fb62eb162ba4d 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1166,7 +1166,7 @@ static int record__mmap_read_evlist(struct record *rec, struct evlist *evlist,
                rc = record__write(rec, NULL, &finished_round_event, sizeof(finished_round_event));
 
        if (overwrite)
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
 out:
        return rc;
 }
@@ -1860,11 +1860,11 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                 * BKW_MMAP_EMPTY here: when done == true and
                 * hits != rec->samples in previous round.
                 *
-                * perf_evlist__toggle_bkw_mmap ensure we never
+                * evlist__toggle_bkw_mmap ensure we never
                 * convert BKW_MMAP_EMPTY to BKW_MMAP_DATA_PENDING.
                 */
                if (trigger_is_hit(&switch_output_trigger) || done || draining)
-                       perf_evlist__toggle_bkw_mmap(rec->evlist, BKW_MMAP_DATA_PENDING);
+                       evlist__toggle_bkw_mmap(rec->evlist, BKW_MMAP_DATA_PENDING);
 
                if (record__mmap_read_all(rec, false) < 0) {
                        trigger_error(&auxtrace_snapshot_trigger);
@@ -1903,7 +1903,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
                         * record__mmap_read_all(): we should have collected
                         * data from it.
                         */
-                       perf_evlist__toggle_bkw_mmap(rec->evlist, BKW_MMAP_RUNNING);
+                       evlist__toggle_bkw_mmap(rec->evlist, BKW_MMAP_RUNNING);
 
                        if (!quiet)
                                fprintf(stderr, "[ perf record: dump data: Woken up %ld times ]\n",

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 7c64134472c7750744c216a1240eea1ea7dc6cb7..b7da09376c728435d3f0290ba481d0a45d1cf866 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -918,14 +918,14 @@ static void perf_top__mmap_read(struct perf_top *top)
        int i;
 
        if (overwrite)
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_DATA_PENDING);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_DATA_PENDING);
 
        for (i = 0; i < top->evlist->core.nr_mmaps; i++)
                perf_top__mmap_read_idx(top, i);
 
        if (overwrite) {
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
-               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);
+               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
        }
 }
 

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index e735d7e37da912ca4cd6d71d792ad32fb01ec71d..48814efb98e8c283307b5aa3cfed645cfed8727c 100644 (file)
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -3264,7 +3264,7 @@ do_hotkey:                 // key came straight from options ui__popup_menu()
                        if (!is_report_browser(hbt)) {
                                struct perf_top *top = hbt->arg;
 
-                               perf_evlist__toggle_enable(top->evlist);
+                               evlist__toggle_enable(top->evlist);
                                /*
                                 * No need to refresh, resort/decay histogram
                                 * entries if we are not collecting samples:

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 198d4ef0388448ace1373ad11f22eab1e5eebf18..3ea3c649ab0444e79bdca72adf0ebb4f62c3d81f 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -447,7 +447,7 @@ void evlist__enable(struct evlist *evlist)
        evlist->enabled = true;
 }
 
-void perf_evlist__toggle_enable(struct evlist *evlist)
+void evlist__toggle_enable(struct evlist *evlist)
 {
        (evlist->enabled ? evlist__disable : evlist__enable)(evlist);
 }
@@ -727,7 +727,7 @@ perf_evlist__mmap_cb_get(struct perf_evlist *_evlist, bool overwrite, int idx)
                if (overwrite) {
                        evlist->overwrite_mmap = maps;
                        if (evlist->bkw_mmap_state == BKW_MMAP_NOTREADY)
-                               perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
+                               evlist__toggle_bkw_mmap(evlist, BKW_MMAP_RUNNING);
                } else {
                        evlist->mmap = maps;
                }
@@ -1613,8 +1613,7 @@ perf_evlist__find_evsel_by_str(struct evlist *evlist,
        return NULL;
 }
 
-void perf_evlist__toggle_bkw_mmap(struct evlist *evlist,
-                                 enum bkw_mmap_state state)
+void evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state state)
 {
        enum bkw_mmap_state old_state = evlist->bkw_mmap_state;
        enum action {

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index a0a53f33a272436fe346b063897682e3f2674ec9..e5a4de1a8915355315ab0312beca8fe832f06b1d 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -168,7 +168,7 @@ struct evsel *perf_evlist__id2evsel_strict(struct evlist *evlist,
 
 struct perf_sample_id *perf_evlist__id2sid(struct evlist *evlist, u64 id);
 
-void perf_evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state state);
+void evlist__toggle_bkw_mmap(struct evlist *evlist, enum bkw_mmap_state state);
 
 void evlist__mmap_consume(struct evlist *evlist, int idx);
 
@@ -207,7 +207,7 @@ size_t evlist__mmap_size(unsigned long pages);
 
 void evlist__disable(struct evlist *evlist);
 void evlist__enable(struct evlist *evlist);
-void perf_evlist__toggle_enable(struct evlist *evlist);
+void evlist__toggle_enable(struct evlist *evlist);
 
 int perf_evlist__enable_event_idx(struct evlist *evlist,
                                  struct evsel *evsel, int idx);