perf evsel: Rename perf_evsel__parse_sample*() to evsel__parse_sample*()

As these are 'struct evsel' methods, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

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/arch/x86/tests/perf-time-to-tsc.c b/tools/perf/arch/x86/tests/perf-time-to-tsc.c
index 909ead08a6f6e1397d786d698845cb76f1174db0..026d32ed078e6e436c743ba008831ed9958ae6a1 100644 (file)
--- a/tools/perf/arch/x86/tests/perf-time-to-tsc.c
+++ b/tools/perf/arch/x86/tests/perf-time-to-tsc.c
@@ -130,13 +130,11 @@ int test__perf_time_to_tsc(struct test *test __maybe_unused, int subtest __maybe
                                goto next_event;
 
                        if (strcmp(event->comm.comm, comm1) == 0) {
-                               CHECK__(perf_evsel__parse_sample(evsel, event,
-                                                                &sample));
+                               CHECK__(evsel__parse_sample(evsel, event, &sample));
                                comm1_time = sample.time;
                        }
                        if (strcmp(event->comm.comm, comm2) == 0) {
-                               CHECK__(perf_evsel__parse_sample(evsel, event,
-                                                                &sample));
+                               CHECK__(evsel__parse_sample(evsel, event, &sample));
                                comm2_time = sample.time;
                        }
 next_event:

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index 842e940523b7cdc92e4a5dbad200fa29152773ff..aad007bfb58158d0e80d606bd59790a773c94ef5 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -546,7 +546,7 @@ static int perf_inject__sched_stat(struct perf_tool *tool,
        return 0;
 found:
        event_sw = &ent->event[0];
-       perf_evsel__parse_sample(evsel, event_sw, &sample_sw);
+       evsel__parse_sample(evsel, event_sw, &sample_sw);
 
        sample_sw.period = sample->period;
        sample_sw.time   = sample->time;

diff --git a/tools/perf/tests/openat-syscall-tp-fields.c b/tools/perf/tests/openat-syscall-tp-fields.c
index 6d026e8a7fa6f8d4f1ec623dd9392c21b17e785f..1dc2897d2df926aaec51da03e0e43490f5a00a23 100644 (file)
--- a/tools/perf/tests/openat-syscall-tp-fields.c
+++ b/tools/perf/tests/openat-syscall-tp-fields.c
@@ -108,7 +108,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest
                                        continue;
                                }
 
-                               err = perf_evsel__parse_sample(evsel, event, &sample);
+                               err = evsel__parse_sample(evsel, event, &sample);
                                if (err) {
                                        pr_debug("Can't parse sample, err = %d\n", err);
                                        goto out_delete_evlist;

diff --git a/tools/perf/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c
index ab964db855ac8119d7aa4e86ae44f7f0ebdfbbf2..a0bdaf390ac8ea78938beb52d2171b9018a1fbd7 100644 (file)
--- a/tools/perf/tests/sample-parsing.c
+++ b/tools/perf/tests/sample-parsing.c
@@ -298,10 +298,10 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
 
        evsel.sample_size = __evsel__sample_size(sample_type);
 
-       err = perf_evsel__parse_sample(&evsel, event, &sample_out);
+       err = evsel__parse_sample(&evsel, event, &sample_out);
        if (err) {
                pr_debug("%s failed for sample_type %#"PRIx64", error %d\n",
-                        "perf_evsel__parse_sample", sample_type, err);
+                        "evsel__parse_sample", sample_type, err);
                goto out_free;
        }
 

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 404542b69543ab3585f6721b8a3d6279f6751ce1..0a0b760d6948423dbafe407e68a067a6c3a64287 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1439,7 +1439,7 @@ int perf_evlist__parse_sample(struct evlist *evlist, union perf_event *event,
 
        if (!evsel)
                return -EFAULT;
-       return perf_evsel__parse_sample(evsel, event, sample);
+       return evsel__parse_sample(evsel, event, sample);
 }
 
 int perf_evlist__parse_sample_timestamp(struct evlist *evlist,
@@ -1450,7 +1450,7 @@ int perf_evlist__parse_sample_timestamp(struct evlist *evlist,
 
        if (!evsel)
                return -EFAULT;
-       return perf_evsel__parse_sample_timestamp(evsel, event, timestamp);
+       return evsel__parse_sample_timestamp(evsel, event, timestamp);
 }
 
 int perf_evlist__strerror_open(struct evlist *evlist,

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index a11d1359ba81513a8df974e43f94be8e225a7123..b63d9eebe42f36b5121e52c2e5f2a6404ef5feb7 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1964,8 +1964,8 @@ perf_event__check_size(union perf_event *event, unsigned int sample_size)
        return 0;
 }
 
-int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event,
-                            struct perf_sample *data)
+int evsel__parse_sample(struct evsel *evsel, union perf_event *event,
+                       struct perf_sample *data)
 {
        u64 type = evsel->core.attr.sample_type;
        bool swapped = evsel->needs_swap;
@@ -2267,9 +2267,8 @@ int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event,
        return 0;
 }
 
-int perf_evsel__parse_sample_timestamp(struct evsel *evsel,
-                                      union perf_event *event,
-                                      u64 *timestamp)
+int evsel__parse_sample_timestamp(struct evsel *evsel, union perf_event *event,
+                                 u64 *timestamp)
 {
        u64 type = evsel->core.attr.sample_type;
        const __u64 *array;

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index a87de95a66c82583e4b788617432e69dfc974274..4b5a411c403c046da1207232170450f73f097356 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -293,12 +293,11 @@ static inline int evsel__read_on_cpu_scaled(struct evsel *evsel, int cpu, int th
        return __evsel__read_on_cpu(evsel, cpu, thread, true);
 }
 
-int perf_evsel__parse_sample(struct evsel *evsel, union perf_event *event,
-                            struct perf_sample *sample);
+int evsel__parse_sample(struct evsel *evsel, union perf_event *event,
+                       struct perf_sample *sample);
 
-int perf_evsel__parse_sample_timestamp(struct evsel *evsel,
-                                      union perf_event *event,
-                                      u64 *timestamp);
+int evsel__parse_sample_timestamp(struct evsel *evsel, union perf_event *event,
+                                 u64 *timestamp);
 
 static inline struct evsel *perf_evsel__next(struct evsel *evsel)
 {

diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index 67810d31f88d3fbc95863db4c615477a25b1f30d..75a9b1d62bba7e5f4cd4f23261d561304c2990dd 100644 (file)
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -1044,7 +1044,7 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
 
                pevent->evsel = evsel;
 
-               err = perf_evsel__parse_sample(evsel, event, &pevent->sample);
+               err = evsel__parse_sample(evsel, event, &pevent->sample);
 
                /* Consume the even only after we parsed it out. */
                perf_mmap__consume(&md->core);