perf evlist: Use the right prefix for 'struct evlist' sample parsing 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-kvm.c b/tools/perf/builtin-kvm.c
index 460945ded6dd23a87e0b362abb67a215b3a61cfb..e1b60aad13cbeb940da9ac5b613ab28370402da1 100644 (file)
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -764,7 +764,7 @@ static s64 perf_kvm__mmap_read_idx(struct perf_kvm_stat *kvm, int idx,
                return (err == -EAGAIN) ? 0 : -1;
 
        while ((event = perf_mmap__read_event(&md->core)) != NULL) {
-               err = perf_evlist__parse_sample_timestamp(evlist, event, &timestamp);
+               err = evlist__parse_sample_timestamp(evlist, event, &timestamp);
                if (err) {
                        perf_mmap__consume(&md->core);
                        pr_err("Failed to parse sample\n");

diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 50dd42da66eec97d71eccf0a11a7d8913b8f5010..fff1d5ef5c49315091af357f54b44e61b5474c30 100644 (file)
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -890,7 +890,7 @@ static void perf_top__mmap_read_idx(struct perf_top *top, int idx)
        while ((event = perf_mmap__read_event(&md->core)) != NULL) {
                int ret;
 
-               ret = perf_evlist__parse_sample_timestamp(evlist, event, &last_timestamp);
+               ret = evlist__parse_sample_timestamp(evlist, event, &last_timestamp);
                if (ret && ret != -1)
                        break;
 
@@ -1153,7 +1153,7 @@ static int deliver_event(struct ordered_events *qe,
                return 0;
        }
 
-       ret = perf_evlist__parse_sample(evlist, event, &sample);
+       ret = evlist__parse_sample(evlist, event, &sample);
        if (ret) {
                pr_err("Can't parse sample, err = %d\n", ret);
                goto next_event;

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 9f6f0f873cbc2155dc45edba4c3ae9b92ee430bd..5638eae36ec8a8658fe8565bb393bcf8bb44cceb 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -3700,9 +3700,8 @@ static int __trace__deliver_event(struct trace *trace, union perf_event *event)
 {
        struct evlist *evlist = trace->evlist;
        struct perf_sample sample;
-       int err;
+       int err = evlist__parse_sample(evlist, event, &sample);
 
-       err = perf_evlist__parse_sample(evlist, event, &sample);
        if (err)
                fprintf(trace->output, "Can't parse sample, err = %d, skipping...\n", err);
        else
@@ -3735,7 +3734,7 @@ static int trace__deliver_event(struct trace *trace, union perf_event *event)
        if (!trace->sort_events)
                return __trace__deliver_event(trace, event);
 
-       err = perf_evlist__parse_sample_timestamp(trace->evlist, event, &trace->oe.last);
+       err = evlist__parse_sample_timestamp(trace->evlist, event, &trace->oe.last);
        if (err && err != -1)
                return err;
 

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 035c9123549a99897a56ac381f59cb60213002ec..339d432b1bf1ccfc8f8eff61796f00bf6fbdbade 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -378,8 +378,8 @@ static int process_sample_event(struct machine *machine,
        struct thread *thread;
        int ret;
 
-       if (perf_evlist__parse_sample(evlist, event, &sample)) {
-               pr_debug("perf_evlist__parse_sample failed\n");
+       if (evlist__parse_sample(evlist, event, &sample)) {
+               pr_debug("evlist__parse_sample failed\n");
                return -1;
        }
 

diff --git a/tools/perf/tests/mmap-basic.c b/tools/perf/tests/mmap-basic.c
index 7b0dbfc0e17d4aa1e4cd6d34394295393f9cc4af..d826153adbf8458859dac5f808f35efa5f68bcdd 100644 (file)
--- a/tools/perf/tests/mmap-basic.c
+++ b/tools/perf/tests/mmap-basic.c
@@ -126,7 +126,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse
                        goto out_delete_evlist;
                }
 
-               err = perf_evlist__parse_sample(evlist, event, &sample);
+               err = evlist__parse_sample(evlist, event, &sample);
                if (err) {
                        pr_err("Can't parse sample, err = %d\n", err);
                        goto out_delete_evlist;

diff --git a/tools/perf/tests/parse-no-sample-id-all.c b/tools/perf/tests/parse-no-sample-id-all.c
index adf3c9c4a416327aa2953130ff285403aa37030e..471273676701bab792d15d28da9fff99048a5535 100644 (file)
--- a/tools/perf/tests/parse-no-sample-id-all.c
+++ b/tools/perf/tests/parse-no-sample-id-all.c
@@ -27,8 +27,8 @@ static int process_event(struct evlist **pevlist, union perf_event *event)
        if (!*pevlist)
                return -1;
 
-       if (perf_evlist__parse_sample(*pevlist, event, &sample)) {
-               pr_debug("perf_evlist__parse_sample failed\n");
+       if (evlist__parse_sample(*pevlist, event, &sample)) {
+               pr_debug("evlist__parse_sample failed\n");
                return -1;
        }
 

diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c
index 8745bf5f93e669fb684563c5af12eecade5ee138..f0b2066c7ea97d2b772d2f2b0fee7bb541198ae9 100644 (file)
--- a/tools/perf/tests/perf-record.c
+++ b/tools/perf/tests/perf-record.c
@@ -182,7 +182,7 @@ int test__PERF_RECORD(struct test *test __maybe_unused, int subtest __maybe_unus
                                if (type < PERF_RECORD_MAX)
                                        nr_events[type]++;
 
-                               err = perf_evlist__parse_sample(evlist, event, &sample);
+                               err = evlist__parse_sample(evlist, event, &sample);
                                if (err < 0) {
                                        if (verbose > 0)
                                                perf_event__fprintf(event, NULL, stderr);

diff --git a/tools/perf/tests/sw-clock.c b/tools/perf/tests/sw-clock.c
index 4b9b731977c8c261c6aa396a16a9bab4024ed3af..a49c9e23053bd4bfe2e19ad7a1d1cfd3cb3d3da8 100644 (file)
--- a/tools/perf/tests/sw-clock.c
+++ b/tools/perf/tests/sw-clock.c
@@ -109,7 +109,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
                if (event->header.type != PERF_RECORD_SAMPLE)
                        goto next_event;
 
-               err = perf_evlist__parse_sample(evlist, event, &sample);
+               err = evlist__parse_sample(evlist, event, &sample);
                if (err < 0) {
                        pr_debug("Error during parse sample\n");
                        goto out_delete_evlist;

diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
index db5e1f70053a87057473a535d57c86b3f556a837..b8cdbe6f324f2ad863787e19125c42031ca1fc14 100644 (file)
--- a/tools/perf/tests/switch-tracking.c
+++ b/tools/perf/tests/switch-tracking.c
@@ -128,8 +128,8 @@ static int process_sample_event(struct evlist *evlist,
        pid_t next_tid, prev_tid;
        int cpu, err;
 
-       if (perf_evlist__parse_sample(evlist, event, &sample)) {
-               pr_debug("perf_evlist__parse_sample failed\n");
+       if (evlist__parse_sample(evlist, event, &sample)) {
+               pr_debug("evlist__parse_sample failed\n");
                return -1;
        }
 
@@ -223,8 +223,8 @@ static int add_event(struct evlist *evlist, struct list_head *events,
        node->event = event;
        list_add(&node->list, events);
 
-       if (perf_evlist__parse_sample(evlist, event, &sample)) {
-               pr_debug("perf_evlist__parse_sample failed\n");
+       if (evlist__parse_sample(evlist, event, &sample)) {
+               pr_debug("evlist__parse_sample failed\n");
                return -1;
        }
 

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 62e7f6c5f8b5d96027c4f413375d03d62fa0549f..647afdcb26995b0eb18ab701c94a9b746f18b722 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -1082,7 +1082,7 @@ static int auxtrace_queue_data_cb(struct perf_session *session,
        if (!qd->samples || event->header.type != PERF_RECORD_SAMPLE)
                return 0;
 
-       err = perf_evlist__parse_sample(session->evlist, event, &sample);
+       err = evlist__parse_sample(session->evlist, event, &sample);
        if (err)
                return err;
 

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 725f9f58bdd1e181da3460b79eabe9d21313e032..943262aa6505b1f80e579995e23d86726a806fdc 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1447,8 +1447,7 @@ int evlist__start_workload(struct evlist *evlist)
        return 0;
 }
 
-int perf_evlist__parse_sample(struct evlist *evlist, union perf_event *event,
-                             struct perf_sample *sample)
+int evlist__parse_sample(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
 {
        struct evsel *evsel = perf_evlist__event2evsel(evlist, event);
 
@@ -1457,9 +1456,7 @@ int perf_evlist__parse_sample(struct evlist *evlist, union perf_event *event,
        return evsel__parse_sample(evsel, event, sample);
 }
 
-int perf_evlist__parse_sample_timestamp(struct evlist *evlist,
-                                       union perf_event *event,
-                                       u64 *timestamp)
+int evlist__parse_sample_timestamp(struct evlist *evlist, union perf_event *event, u64 *timestamp)
 {
        struct evsel *evsel = perf_evlist__event2evsel(evlist, event);
 

diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 736cb639df84aa8ad034b193d459a5e47fc69652..c59a08cf9f25a923eb5d3461146ee9cffd6db863 100644 (file)
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -224,12 +224,8 @@ 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);
 
-int perf_evlist__parse_sample(struct evlist *evlist, union perf_event *event,
-                             struct perf_sample *sample);
-
-int perf_evlist__parse_sample_timestamp(struct evlist *evlist,
-                                       union perf_event *event,
-                                       u64 *timestamp);
+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);
 
 bool evlist__valid_sample_type(struct evlist *evlist);
 bool evlist__valid_sample_id_all(struct evlist *evlist);

diff --git a/tools/perf/util/s390-cpumsf.c b/tools/perf/util/s390-cpumsf.c
index f8861998e5bd2645119dbd5c26889dd0adb6f390..959e9890bcccee08b3087f18f9fa31781c6aace3 100644 (file)
--- a/tools/perf/util/s390-cpumsf.c
+++ b/tools/perf/util/s390-cpumsf.c
@@ -96,9 +96,9 @@
  * |    than PERF_RECORD_USER_TYPE_START) are handled by
  * |    perf_session__process_user_event(see below)
  * |  - Those generated by the kernel are handled by
- * |    perf_evlist__parse_sample_timestamp()
+ * |    evlist__parse_sample_timestamp()
  * |
- * perf_evlist__parse_sample_timestamp()
+ * evlist__parse_sample_timestamp()
  * |  Extract time stamp from sample data.
  * |
  * perf_session__queue_event()

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 5cc722b6fe7c065fcd12fd52dcfaaab040b710fa..61e4b3cc73135049afc5f99134fae83fec1cb1ba 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1523,9 +1523,8 @@ static int perf_session__deliver_event(struct perf_session *session,
                                       u64 file_offset)
 {
        struct perf_sample sample;
-       int ret;
+       int ret = evlist__parse_sample(session->evlist, event, &sample);
 
-       ret = perf_evlist__parse_sample(session->evlist, event, &sample);
        if (ret) {
                pr_err("Can't parse sample, err = %d\n", ret);
                return ret;
@@ -1697,7 +1696,7 @@ int perf_session__peek_event(struct perf_session *session, off_t file_offset,
 out_parse_sample:
 
        if (sample && event->header.type < PERF_RECORD_USER_TYPE_START &&
-           perf_evlist__parse_sample(session->evlist, event, sample))
+           evlist__parse_sample(session->evlist, event, sample))
                return -1;
 
        *event_ptr = event;
@@ -1754,7 +1753,7 @@ static s64 perf_session__process_event(struct perf_session *session,
        if (tool->ordered_events) {
                u64 timestamp = -1ULL;
 
-               ret = perf_evlist__parse_sample_timestamp(evlist, event, &timestamp);
+               ret = evlist__parse_sample_timestamp(evlist, event, &timestamp);
                if (ret && ret != -1)
                        return ret;