perf evlist: Fix the class prefix for 'struct evlist' sample_id_all methods

To differentiate from libperf's 'struct perf_evlist' methods.

Cc: Adrian Hunter <adrian.hunter@intel.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 1eeb58e..19b1d5e 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1646,7 +1646,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
         * Normally perf_session__new would do this, but it doesn't have the
         * evlist.
         */
-       if (rec->tool.ordered_events && !perf_evlist__sample_id_all(rec->evlist)) {
+       if (rec->tool.ordered_events && !evlist__sample_id_all(rec->evlist)) {
                pr_warning("WARNING: No sample_id_all support, falling back to unordered processing\n");
                rec->tool.ordered_events = false;
        }

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6415f97..daae5c6 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -537,7 +537,7 @@ struct evsel *perf_evlist__id2evsel(struct evlist *evlist, u64 id)
        if (sid)
                return container_of(sid->evsel, struct evsel, core);
 
-       if (!perf_evlist__sample_id_all(evlist))
+       if (!evlist__sample_id_all(evlist))
                return evlist__first(evlist);
 
        return NULL;
@@ -1188,7 +1188,7 @@ out:
        return size;
 }
 
-bool perf_evlist__valid_sample_id_all(struct evlist *evlist)
+bool evlist__valid_sample_id_all(struct evlist *evlist)
 {
        struct evsel *first = evlist__first(evlist), *pos = first;
 
@@ -1200,7 +1200,7 @@ bool perf_evlist__valid_sample_id_all(struct evlist *evlist)
        return true;
 }
 
-bool perf_evlist__sample_id_all(struct evlist *evlist)
+bool evlist__sample_id_all(struct evlist *evlist)
 {
        struct evsel *first = evlist__first(evlist);
        return first->core.attr.sample_id_all;

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 2edc151..6c7b865 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -221,7 +221,7 @@ void perf_evlist__set_leader(struct evlist *evlist);
 u64 __evlist__combined_sample_type(struct evlist *evlist);
 u64 evlist__combined_sample_type(struct evlist *evlist);
 u64 perf_evlist__combined_branch_type(struct evlist *evlist);
-bool perf_evlist__sample_id_all(struct evlist *evlist);
+bool evlist__sample_id_all(struct evlist *evlist);
 u16 perf_evlist__id_hdr_size(struct evlist *evlist);
 
 int perf_evlist__parse_sample(struct evlist *evlist, union perf_event *event,
@@ -232,7 +232,7 @@ int perf_evlist__parse_sample_timestamp(struct evlist *evlist,
                                        u64 *timestamp);
 
 bool evlist__valid_sample_type(struct evlist *evlist);
-bool perf_evlist__valid_sample_id_all(struct evlist *evlist);
+bool evlist__valid_sample_id_all(struct evlist *evlist);
 bool perf_evlist__valid_read_format(struct evlist *evlist);
 
 void perf_evlist__splice_list_tail(struct evlist *evlist,

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index cbc8c47..396424f 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -120,7 +120,7 @@ static int perf_session__open(struct perf_session *session)
                return -1;
        }
 
-       if (!perf_evlist__valid_sample_id_all(session->evlist)) {
+       if (!evlist__valid_sample_id_all(session->evlist)) {
                pr_err("non matching sample_id_all\n");
                return -1;
        }
@@ -252,10 +252,10 @@ struct perf_session *perf_session__new(struct perf_data *data,
 
        /*
         * In pipe-mode, evlist is empty until PERF_RECORD_HEADER_ATTR is
-        * processed, so perf_evlist__sample_id_all is not meaningful here.
+        * processed, so evlist__sample_id_all is not meaningful here.
         */
        if ((!data || !data->is_pipe) && tool && tool->ordering_requires_timestamps &&
-           tool->ordered_events && !perf_evlist__sample_id_all(session->evlist)) {
+           tool->ordered_events && !evlist__sample_id_all(session->evlist)) {
                dump_printf("WARNING: No sample_id_all support, falling back to unordered processing\n");
                tool->ordered_events = false;
        }
@@ -1163,7 +1163,7 @@ static void perf_evlist__print_tstamp(struct evlist *evlist,
        u64 sample_type = __evlist__combined_sample_type(evlist);
 
        if (event->header.type != PERF_RECORD_SAMPLE &&
-           !perf_evlist__sample_id_all(evlist)) {
+           !evlist__sample_id_all(evlist)) {
                fputs("-1 -1 ", stdout);
                return;
        }
@@ -1655,7 +1655,7 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset,
                return -1;
 
        if (session->header.needs_swap)
-               event_swap(event, perf_evlist__sample_id_all(session->evlist));
+               event_swap(event, evlist__sample_id_all(session->evlist));
 
 out_parse_sample:
 
@@ -1704,7 +1704,7 @@ static s64 perf_session__process_event(struct perf_session *session,
        int ret;
 
        if (session->header.needs_swap)
-               event_swap(event, perf_evlist__sample_id_all(evlist));
+               event_swap(event, evlist__sample_id_all(evlist));
 
        if (event->header.type >= PERF_RECORD_HEADER_MAX)
                return -EINVAL;