perf evlist: Use the right prefix for 'struct evlist' header 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 59264a7a858a290281a4ff985eb55883998b6d90..23eef3cedc2f9bab133bfa3865291fe5d691673f 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1131,7 +1131,7 @@ bool evlist__valid_read_format(struct evlist *evlist)
        return true;
 }
 
-u16 perf_evlist__id_hdr_size(struct evlist *evlist)
+u16 evlist__id_hdr_size(struct evlist *evlist)
 {
        struct evsel *first = evlist__first(evlist);
        struct perf_sample *data;

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 8a5b515193b33c83908219e7917f55e1ad50d9ff..9b0c795736bb52df7c8d932ecca2f97f9fe5ec12 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -201,7 +201,7 @@ u64 __evlist__combined_sample_type(struct evlist *evlist);
 u64 evlist__combined_sample_type(struct evlist *evlist);
 u64 evlist__combined_branch_type(struct evlist *evlist);
 bool evlist__sample_id_all(struct evlist *evlist);
-u16 perf_evlist__id_hdr_size(struct evlist *evlist);
+u16 evlist__id_hdr_size(struct evlist *evlist);
 
 int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample);
 int evlist__parse_sample_timestamp(struct evlist *evlist, union perf_event *event, u64 *timestamp);

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index be219051119cec6825780dfb4486ae8035ed478e..062383e225a3e9e64f229b739d2c155b5430e28d 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2275,9 +2275,7 @@ static struct evsel *evlist__find_by_index(struct evlist *evlist, int idx)
        return NULL;
 }
 
-static void
-perf_evlist__set_event_name(struct evlist *evlist,
-                           struct evsel *event)
+static void evlist__set_event_name(struct evlist *evlist, struct evsel *event)
 {
        struct evsel *evsel;
 
@@ -2312,7 +2310,7 @@ process_event_desc(struct feat_fd *ff, void *data __maybe_unused)
        }
 
        for (evsel = events; evsel->core.attr.size; evsel++)
-               perf_evlist__set_event_name(session->evlist, evsel);
+               evlist__set_event_name(session->evlist, evsel);
 
        if (!session->data->is_pipe)
                free_event_desc(events);
@@ -3765,8 +3763,7 @@ static int evsel__prepare_tracepoint_event(struct evsel *evsel, struct tep_handl
        return 0;
 }
 
-static int perf_evlist__prepare_tracepoint_events(struct evlist *evlist,
-                                                 struct tep_handle *pevent)
+static int evlist__prepare_tracepoint_events(struct evlist *evlist, struct tep_handle *pevent)
 {
        struct evsel *pos;
 
@@ -3881,8 +3878,7 @@ int perf_session__read_header(struct perf_session *session)
        perf_header__process_sections(header, fd, &session->tevent,
                                      perf_file_section__process);
 
-       if (perf_evlist__prepare_tracepoint_events(session->evlist,
-                                                  session->tevent.pevent))
+       if (evlist__prepare_tracepoint_events(session->evlist, session->tevent.pevent))
                goto out_delete_evlist;
 
        return 0;
@@ -4103,8 +4099,7 @@ int perf_event__process_tracing_data(struct perf_session *session,
                return -1;
        }
 
-       perf_evlist__prepare_tracepoint_events(session->evlist,
-                                              session->tevent.pevent);
+       evlist__prepare_tracepoint_events(session->evlist, session->tevent.pevent);
 
        return size_read + padding;
 }

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 83de3209000871c2ec8161b09aa902ed91edc591..69799e747bf03b7ab1cbd42c2740a2c12ae78bf0 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -135,7 +135,7 @@ static int perf_session__open(struct perf_session *session)
 
 void perf_session__set_id_hdr_size(struct perf_session *session)
 {
-       u16 id_hdr_size = perf_evlist__id_hdr_size(session->evlist);
+       u16 id_hdr_size = evlist__id_hdr_size(session->evlist);
 
        machines__set_id_hdr_size(&session->machines, id_hdr_size);
 }