perf evlist: Use the right prefix for 'struct evlist' id_pos 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/util/evlist.c b/tools/perf/util/evlist.c
index b5a53e1..26c436a 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -103,13 +103,13 @@ struct evlist *perf_evlist__new_dummy(void)
 }
 
 /**
- * perf_evlist__set_id_pos - set the positions of event ids.
+ * evlist__set_id_pos - set the positions of event ids.
  * @evlist: selected event list
  *
  * Events with compatible sample types all have the same id_pos
  * and is_pos.  For convenience, put a copy on evlist.
  */
-void perf_evlist__set_id_pos(struct evlist *evlist)
+void evlist__set_id_pos(struct evlist *evlist)
 {
        struct evsel *first = evlist__first(evlist);
 
@@ -117,14 +117,14 @@ void perf_evlist__set_id_pos(struct evlist *evlist)
        evlist->is_pos = first->is_pos;
 }
 
-static void perf_evlist__update_id_pos(struct evlist *evlist)
+static void evlist__update_id_pos(struct evlist *evlist)
 {
        struct evsel *evsel;
 
        evlist__for_each_entry(evlist, evsel)
                evsel__calc_id_pos(evsel);
 
-       perf_evlist__set_id_pos(evlist);
+       evlist__set_id_pos(evlist);
 }
 
 static void evlist__purge(struct evlist *evlist)
@@ -168,7 +168,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry)
        perf_evlist__add(&evlist->core, &entry->core);
 
        if (evlist->core.nr_entries == 1)
-               perf_evlist__set_id_pos(evlist);
+               evlist__set_id_pos(evlist);
 }
 
 void evlist__remove(struct evlist *evlist, struct evsel *evsel)
@@ -1275,7 +1275,7 @@ int evlist__open(struct evlist *evlist)
                        goto out_err;
        }
 
-       perf_evlist__update_id_pos(evlist);
+       evlist__update_id_pos(evlist);
 
        evlist__for_each_entry(evlist, evsel) {
                err = evsel__open(evsel, evsel->core.cpus, evsel->core.threads);

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 14bf7e2..85da0c4 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -158,7 +158,7 @@ void evlist__close(struct evlist *evlist);
 
 struct callchain_param;
 
-void perf_evlist__set_id_pos(struct evlist *evlist);
+void evlist__set_id_pos(struct evlist *evlist);
 void perf_evlist__config(struct evlist *evlist, struct record_opts *opts,
                         struct callchain_param *callchain);
 int record_opts__config(struct record_opts *opts);

diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c
index 7330407..220b991 100644 (file)
--- a/tools/perf/util/record.c
+++ b/tools/perf/util/record.c
@@ -144,7 +144,7 @@ void perf_evlist__config(struct evlist *evlist, struct record_opts *opts,
                        evsel__set_sample_id(evsel, use_sample_identifier);
        }
 
-       perf_evlist__set_id_pos(evlist);
+       evlist__set_id_pos(evlist);
 }
 
 static int get_max_rate(unsigned int *rate)

diff --git a/tools/perf/util/sideband_evlist.c b/tools/perf/util/sideband_evlist.c
index 9c04c71..13f387b 100644 (file)
--- a/tools/perf/util/sideband_evlist.c
+++ b/tools/perf/util/sideband_evlist.c
@@ -110,7 +110,7 @@ int evlist__start_sb_thread(struct evlist *evlist, struct target *target)
                evlist__for_each_entry(evlist, counter)
                        evsel__set_sample_id(counter, can_sample_identifier);
 
-               perf_evlist__set_id_pos(evlist);
+               evlist__set_id_pos(evlist);
        }
 
        evlist__for_each_entry(evlist, counter) {