perf evlist: Use the right prefix for 'struct evlist' event group 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-annotate.c b/tools/perf/builtin-annotate.c
index d6a81a6e1041c2e769a4098e150b1c8f7a58a0cc..a23ba6bb99b6ea98daad4d0b2d22109d172ec84e 100644 (file)
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -598,7 +598,7 @@ int cmd_annotate(int argc, const char **argv)
                                                      HEADER_BRANCH_STACK);
 
        if (annotate.group_set)
-               perf_evlist__force_leader(annotate.session->evlist);
+               evlist__force_leader(annotate.session->evlist);
 
        ret = symbol__annotation_init();
        if (ret < 0)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index e956348c90811ffa087327037f5d1d918df355d8..412717406dc9a4c85ced9762789bf2a083b64f0f 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -923,7 +923,7 @@ try_again:
                        if ((errno == EINVAL || errno == EBADF) &&
                            pos->leader != pos &&
                            pos->weak_group) {
-                               pos = perf_evlist__reset_weak_group(evlist, pos, true);
+                               pos = evlist__reset_weak_group(evlist, pos, true);
                                goto try_again;
                        }
                        rc = -errno;

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 0a335bef64d0c3cbdc2042b6f3c08a4db7b74c35..e78614ab7a16b1d2f4738153b4eae1e8d2a8ee8d 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -211,7 +211,7 @@ static void setup_forced_leader(struct report *report,
                                struct evlist *evlist)
 {
        if (report->group_set)
-               perf_evlist__force_leader(evlist);
+               evlist__force_leader(evlist);
 }
 
 static int process_feature_event(struct perf_session *session,

diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index 1e967c32db7c050c38fdff551edb18e390797d58..89c32692f40c74ea9a785daa8662a4a3784b14ee 100644 (file)
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -759,7 +759,7 @@ try_again:
                                if ((errno == EINVAL || errno == EBADF) &&
                                    counter->leader != counter &&
                                    counter->weak_group) {
-                                       perf_evlist__reset_weak_group(evsel_list, counter, false);
+                                       evlist__reset_weak_group(evsel_list, counter, false);
                                        assert(counter->reset_group);
                                        second_pass = true;
                                        continue;

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 8c94e21db2aa76d452795640d17bc66aa9d2d27b..a60878498139956c6cf070de6eafed8629307987 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -62,9 +62,7 @@
  * Make a group from 'leader' to 'last', requiring that the events were not
  * already grouped to a different leader.
  */
-static int perf_evlist__regroup(struct evlist *evlist,
-                               struct evsel *leader,
-                               struct evsel *last)
+static int evlist__regroup(struct evlist *evlist, struct evsel *leader, struct evsel *last)
 {
        struct evsel *evsel;
        bool grp;
@@ -775,7 +773,7 @@ no_opt:
                        evsel->core.attr.aux_sample_size = term->val.aux_sample_size;
                        /* If possible, group with the AUX event */
                        if (aux_evsel && evsel->core.attr.aux_sample_size)
-                               perf_evlist__regroup(evlist, aux_evsel, evsel);
+                               evlist__regroup(evlist, aux_evsel, evsel);
                }
        }
 

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index e68e5a40b49abab30e0d51158b442a94b717cf60..869195b6f21c4d486fd8eece72ff236816c56c2f 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1650,7 +1650,7 @@ bool perf_evlist__exclude_kernel(struct evlist *evlist)
  * the group display. Set the artificial group and set the leader's
  * forced_leader flag to notify the display code.
  */
-void perf_evlist__force_leader(struct evlist *evlist)
+void evlist__force_leader(struct evlist *evlist)
 {
        if (!evlist->nr_groups) {
                struct evsel *leader = evlist__first(evlist);
@@ -1660,9 +1660,7 @@ void perf_evlist__force_leader(struct evlist *evlist)
        }
 }
 
-struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,
-                                                struct evsel *evsel,
-                                               bool close)
+struct evsel *evlist__reset_weak_group(struct evlist *evsel_list, struct evsel *evsel, bool close)
 {
        struct evsel *c2, *leader;
        bool is_open = true;

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 3b3bf3d2820457b33a9cfabd4c42b0148d669a91..d09970e7c838e4135f66ab14510325d63bc926a2 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -324,11 +324,10 @@ struct evsel *evlist__event2evsel(struct evlist *evlist, union perf_event *event
 
 bool perf_evlist__exclude_kernel(struct evlist *evlist);
 
-void perf_evlist__force_leader(struct evlist *evlist);
+void evlist__force_leader(struct evlist *evlist);
+
+struct evsel *evlist__reset_weak_group(struct evlist *evlist, struct evsel *evsel, bool close);
 
-struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,
-                                                struct evsel *evsel,
-                                               bool close);
 #define EVLIST_CTL_CMD_ENABLE_TAG  "enable"
 #define EVLIST_CTL_CMD_DISABLE_TAG "disable"
 #define EVLIST_CTL_CMD_ACK_TAG     "ack\n"