perf evsel: Rename __perf_evsel__sample_size() to __evsel__sample_size()

As it is a 'struct evsel' related method, 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/tests/sample-parsing.c b/tools/perf/tests/sample-parsing.c
index 61865699c3f4fc62dc8090bbd126e1cdcab1eba6..ab964db855ac8119d7aa4e86ae44f7f0ebdfbbf2 100644 (file)
--- a/tools/perf/tests/sample-parsing.c
+++ b/tools/perf/tests/sample-parsing.c
@@ -296,7 +296,7 @@ static int do_test(u64 sample_type, u64 sample_regs, u64 read_format)
                goto out_free;
        }
 
-       evsel.sample_size = __perf_evsel__sample_size(sample_type);
+       evsel.sample_size = __evsel__sample_size(sample_type);
 
        err = perf_evsel__parse_sample(&evsel, event, &sample_out);
        if (err) {

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 896b0b9798d831b2fafb0a449137fce77b574bbe..3a16728074a9409d82fd668c6a7df81e60e20138 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -102,7 +102,7 @@ set_methods:
 
 #define FD(e, x, y) (*(int *)xyarray__entry(e->core.fd, x, y))
 
-int __perf_evsel__sample_size(u64 sample_type)
+int __evsel__sample_size(u64 sample_type)
 {
        u64 mask = sample_type & PERF_SAMPLE_MASK;
        int size = 0;
@@ -249,7 +249,7 @@ void evsel__init(struct evsel *evsel,
        evsel->bpf_fd      = -1;
        INIT_LIST_HEAD(&evsel->config_terms);
        perf_evsel__object.init(evsel);
-       evsel->sample_size = __perf_evsel__sample_size(attr->sample_type);
+       evsel->sample_size = __evsel__sample_size(attr->sample_type);
        evsel__calc_id_pos(evsel);
        evsel->cmdline_group_boundary = false;
        evsel->metric_expr   = NULL;

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 35ad62807eaf8bb242f793b006808cef03ed1b90..580975c7086af056087e48a1c22187b6007e1718 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -193,7 +193,7 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
 void evsel__config_callchain(struct evsel *evsel, struct record_opts *opts,
                             struct callchain_param *callchain);
 
-int __perf_evsel__sample_size(u64 sample_type);
+int __evsel__sample_size(u64 sample_type);
 void evsel__calc_id_pos(struct evsel *evsel);
 
 bool perf_evsel__is_cache_op_valid(u8 type, u8 op);

diff --git a/tools/perf/util/intel-bts.c b/tools/perf/util/intel-bts.c
index 506112f526192a911818ac1a23a15728145119a3..af1e78d76228d88ffd7ca07bde719a930d35f48f 100644 (file)
--- a/tools/perf/util/intel-bts.c
+++ b/tools/perf/util/intel-bts.c
@@ -825,10 +825,10 @@ static int intel_bts_synth_events(struct intel_bts *bts,
                bts->branches_id = id;
                /*
                 * We only use sample types from PERF_SAMPLE_MASK so we can use
-                * __perf_evsel__sample_size() here.
+                * __evsel__sample_size() here.
                 */
                bts->branches_event_size = sizeof(struct perf_record_sample) +
-                               __perf_evsel__sample_size(attr.sample_type);
+                                          __evsel__sample_size(attr.sample_type);
        }
 
        return 0;