perf evlist: Use the right prefix for 'struct evlist' sideband thread 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 d53396421a02285297ca86fb62ce3fc6e4b80764..04946bd3d090fcae9adfac5c129adfa2bdcb3bff 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1548,7 +1548,7 @@ static int record__setup_sb_evlist(struct record *rec)
                }
        }
 #endif
-       if (perf_evlist__start_sb_thread(rec->sb_evlist, &rec->opts.target)) {
+       if (evlist__start_sb_thread(rec->sb_evlist, &rec->opts.target)) {
                pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
                opts->no_bpf_event = true;
        }
@@ -2065,7 +2065,7 @@ out_delete_session:
        perf_session__delete(session);
 
        if (!opts->no_bpf_event)
-               perf_evlist__stop_sb_thread(rec->sb_evlist);
+               evlist__stop_sb_thread(rec->sb_evlist);
        return status;
 }
 

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index b7da09376c728435d3f0290ba481d0a45d1cf866..50dd42da66eec97d71eccf0a11a7d8913b8f5010 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -1762,7 +1762,7 @@ int cmd_top(int argc, const char **argv)
        }
 #endif
 
-       if (perf_evlist__start_sb_thread(top.sb_evlist, target)) {
+       if (evlist__start_sb_thread(top.sb_evlist, target)) {
                pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
                opts->no_bpf_event = true;
        }
@@ -1770,7 +1770,7 @@ int cmd_top(int argc, const char **argv)
        status = __cmd_top(&top);
 
        if (!opts->no_bpf_event)
-               perf_evlist__stop_sb_thread(top.sb_evlist);
+               evlist__stop_sb_thread(top.sb_evlist);
 
 out_delete_evlist:
        evlist__delete(top.evlist);

diff --git a/tools/perf/util/bpf-event.c b/tools/perf/util/bpf-event.c
index 3742511a08d15cc942e041a45caebc32eb5dd1b2..57d58c81a5f8eb365b7749e90dd2cccf53a5a675 100644 (file)
--- a/tools/perf/util/bpf-event.c
+++ b/tools/perf/util/bpf-event.c
@@ -526,7 +526,7 @@ int evlist__add_bpf_sb_event(struct evlist *evlist, struct perf_env *env)
         */
        attr.wakeup_watermark = 1;
 
-       return perf_evlist__add_sb_event(evlist, &attr, bpf_event__sb_cb, env);
+       return evlist__add_sb_event(evlist, &attr, bpf_event__sb_cb, env);
 }
 
 void bpf_event__print_bpf_prog_info(struct bpf_prog_info *info,

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 3b1acf70b5dda8880525fc790830cf0cd6d15f2c..736cb639df84aa8ad034b193d459a5e47fc69652 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -112,14 +112,11 @@ int __evlist__add_default_attrs(struct evlist *evlist,
 
 int evlist__add_dummy(struct evlist *evlist);
 
-int perf_evlist__add_sb_event(struct evlist *evlist,
-                             struct perf_event_attr *attr,
-                             evsel__sb_cb_t cb,
-                             void *data);
+int evlist__add_sb_event(struct evlist *evlist, struct perf_event_attr *attr,
+                        evsel__sb_cb_t cb, void *data);
 void evlist__set_cb(struct evlist *evlist, evsel__sb_cb_t cb, void *data);
-int perf_evlist__start_sb_thread(struct evlist *evlist,
-                                struct target *target);
-void perf_evlist__stop_sb_thread(struct evlist *evlist);
+int evlist__start_sb_thread(struct evlist *evlist, struct target *target);
+void evlist__stop_sb_thread(struct evlist *evlist);
 
 int evlist__add_newtp(struct evlist *evlist, const char *sys, const char *name, void *handler);
 

diff --git a/tools/perf/util/sideband_evlist.c b/tools/perf/util/sideband_evlist.c
index ded9ced027973bc7b863be49653a8010175c450b..90ed016bb3489e308ef6cb85f035823a6fb5d752 100644 (file)
--- a/tools/perf/util/sideband_evlist.c
+++ b/tools/perf/util/sideband_evlist.c
@@ -12,8 +12,8 @@
 #include <sched.h>
 #include <stdbool.h>
 
-int perf_evlist__add_sb_event(struct evlist *evlist, struct perf_event_attr *attr,
-                             evsel__sb_cb_t cb, void *data)
+int evlist__add_sb_event(struct evlist *evlist, struct perf_event_attr *attr,
+                        evsel__sb_cb_t cb, void *data)
 {
        struct evsel *evsel;
 
@@ -94,7 +94,7 @@ void evlist__set_cb(struct evlist *evlist, evsel__sb_cb_t cb, void *data)
       }
 }
 
-int perf_evlist__start_sb_thread(struct evlist *evlist, struct target *target)
+int evlist__start_sb_thread(struct evlist *evlist, struct target *target)
 {
        struct evsel *counter;
 
@@ -138,7 +138,7 @@ out_delete_evlist:
        return -1;
 }
 
-void perf_evlist__stop_sb_thread(struct evlist *evlist)
+void evlist__stop_sb_thread(struct evlist *evlist)
 {
        if (!evlist)
                return;