Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -6
+1 -1
tools/perf/tests/sample-parsing.c
··· 296 296 goto out_free; 297 297 } 298 298 299 - evsel.sample_size = __perf_evsel__sample_size(sample_type); 299 + evsel.sample_size = __evsel__sample_size(sample_type); 300 300 301 301 err = perf_evsel__parse_sample(&evsel, event, &sample_out); 302 302 if (err) {
+2 -2
tools/perf/util/evsel.c
··· 102 102 103 103 #define FD(e, x, y) (*(int *)xyarray__entry(e->core.fd, x, y)) 104 104 105 - int __perf_evsel__sample_size(u64 sample_type) 105 + int __evsel__sample_size(u64 sample_type) 106 106 { 107 107 u64 mask = sample_type & PERF_SAMPLE_MASK; 108 108 int size = 0; ··· 249 249 evsel->bpf_fd = -1; 250 250 INIT_LIST_HEAD(&evsel->config_terms); 251 251 perf_evsel__object.init(evsel); 252 - evsel->sample_size = __perf_evsel__sample_size(attr->sample_type); 252 + evsel->sample_size = __evsel__sample_size(attr->sample_type); 253 253 evsel__calc_id_pos(evsel); 254 254 evsel->cmdline_group_boundary = false; 255 255 evsel->metric_expr = NULL;
+1 -1
tools/perf/util/evsel.h
··· 193 193 void evsel__config_callchain(struct evsel *evsel, struct record_opts *opts, 194 194 struct callchain_param *callchain); 195 195 196 - int __perf_evsel__sample_size(u64 sample_type); 196 + int __evsel__sample_size(u64 sample_type); 197 197 void evsel__calc_id_pos(struct evsel *evsel); 198 198 199 199 bool perf_evsel__is_cache_op_valid(u8 type, u8 op);
+2 -2
tools/perf/util/intel-bts.c
··· 825 825 bts->branches_id = id; 826 826 /* 827 827 * We only use sample types from PERF_SAMPLE_MASK so we can use 828 - * __perf_evsel__sample_size() here. 828 + * __evsel__sample_size() here. 829 829 */ 830 830 bts->branches_event_size = sizeof(struct perf_record_sample) + 831 - __perf_evsel__sample_size(attr.sample_type); 831 + __evsel__sample_size(attr.sample_type); 832 832 } 833 833 834 834 return 0;