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

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

kernel os linux

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>

Arnaldo Carvalho de Melo 5 years ago b3c2cc2b d1f249ec

+15 -15

6 changed files

expand all

tools

perf

builtin-c2c.c

builtin-report.c

builtin-script.c

util

evlist.c

evlist.h

session.c

+1 -1

tools/perf/builtin-c2c.c

··· 2582 2582 2583 2583 static int setup_callchain(struct evlist *evlist) 2584 2584 { 2585 - u64 sample_type = perf_evlist__combined_sample_type(evlist); 2585 + u64 sample_type = evlist__combined_sample_type(evlist); 2586 2586 enum perf_call_graph_mode mode = CALLCHAIN_NONE; 2587 2587 2588 2588 if ((sample_type & PERF_SAMPLE_REGS_USER) &&

+3 -3

tools/perf/builtin-report.c

··· 338 338 static int report__setup_sample_type(struct report *rep) 339 339 { 340 340 struct perf_session *session = rep->session; 341 - u64 sample_type = perf_evlist__combined_sample_type(session->evlist); 341 + u64 sample_type = evlist__combined_sample_type(session->evlist); 342 342 bool is_pipe = perf_data__is_pipe(session->data); 343 343 344 344 if (session->itrace_synth_opts->callchain || ··· 1093 1093 * Check if we need to enable callchains based 1094 1094 * on events sample_type. 1095 1095 */ 1096 - sample_type = perf_evlist__combined_sample_type(*pevlist); 1096 + sample_type = evlist__combined_sample_type(*pevlist); 1097 1097 callchain_param_setup(sample_type); 1098 1098 return 0; 1099 1099 } ··· 1389 1389 1390 1390 has_br_stack = perf_header__has_feat(&session->header, 1391 1391 HEADER_BRANCH_STACK); 1392 - if (perf_evlist__combined_sample_type(session->evlist) & PERF_SAMPLE_STACK_USER) 1392 + if (evlist__combined_sample_type(session->evlist) & PERF_SAMPLE_STACK_USER) 1393 1393 has_br_stack = false; 1394 1394 1395 1395 setup_forced_leader(&report, session->evlist);

+2 -2

tools/perf/builtin-script.c

··· 2129 2129 * Check if we need to enable callchains based 2130 2130 * on events sample_type. 2131 2131 */ 2132 - sample_type = perf_evlist__combined_sample_type(evlist); 2132 + sample_type = evlist__combined_sample_type(evlist); 2133 2133 callchain_param_setup(sample_type); 2134 2134 2135 2135 /* Enable fields for callchain entries */ ··· 3171 3171 static void script__setup_sample_type(struct perf_script *script) 3172 3172 { 3173 3173 struct perf_session *session = script->session; 3174 - u64 sample_type = perf_evlist__combined_sample_type(session->evlist); 3174 + u64 sample_type = evlist__combined_sample_type(session->evlist); 3175 3175 3176 3176 if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain) { 3177 3177 if ((sample_type & PERF_SAMPLE_REGS_USER) &&

+4 -4

tools/perf/util/evlist.c

··· 1085 1085 return perf_evlist__append_tp_filter_pids(evlist, 1, &pid); 1086 1086 } 1087 1087 1088 - bool perf_evlist__valid_sample_type(struct evlist *evlist) 1088 + bool evlist__valid_sample_type(struct evlist *evlist) 1089 1089 { 1090 1090 struct evsel *pos; 1091 1091 ··· 1104 1104 return true; 1105 1105 } 1106 1106 1107 - u64 __perf_evlist__combined_sample_type(struct evlist *evlist) 1107 + u64 __evlist__combined_sample_type(struct evlist *evlist) 1108 1108 { 1109 1109 struct evsel *evsel; 1110 1110 ··· 1117 1117 return evlist->combined_sample_type; 1118 1118 } 1119 1119 1120 - u64 perf_evlist__combined_sample_type(struct evlist *evlist) 1120 + u64 evlist__combined_sample_type(struct evlist *evlist) 1121 1121 { 1122 1122 evlist->combined_sample_type = 0; 1123 - return __perf_evlist__combined_sample_type(evlist); 1123 + return __evlist__combined_sample_type(evlist); 1124 1124 } 1125 1125 1126 1126 u64 perf_evlist__combined_branch_type(struct evlist *evlist)

+3 -3

tools/perf/util/evlist.h

··· 218 218 void __perf_evlist__set_leader(struct list_head *list); 219 219 void perf_evlist__set_leader(struct evlist *evlist); 220 220 221 - u64 __perf_evlist__combined_sample_type(struct evlist *evlist); 222 - u64 perf_evlist__combined_sample_type(struct evlist *evlist); 221 + u64 __evlist__combined_sample_type(struct evlist *evlist); 222 + u64 evlist__combined_sample_type(struct evlist *evlist); 223 223 u64 perf_evlist__combined_branch_type(struct evlist *evlist); 224 224 bool perf_evlist__sample_id_all(struct evlist *evlist); 225 225 u16 perf_evlist__id_hdr_size(struct evlist *evlist); ··· 231 231 union perf_event *event, 232 232 u64 *timestamp); 233 233 234 - bool perf_evlist__valid_sample_type(struct evlist *evlist); 234 + bool evlist__valid_sample_type(struct evlist *evlist); 235 235 bool perf_evlist__valid_sample_id_all(struct evlist *evlist); 236 236 bool perf_evlist__valid_read_format(struct evlist *evlist); 237 237

+2 -2

tools/perf/util/session.c

··· 115 115 if (perf_header__has_feat(&session->header, HEADER_STAT)) 116 116 return 0; 117 117 118 - if (!perf_evlist__valid_sample_type(session->evlist)) { 118 + if (!evlist__valid_sample_type(session->evlist)) { 119 119 pr_err("non matching sample_type\n"); 120 120 return -1; 121 121 } ··· 1160 1160 union perf_event *event, 1161 1161 struct perf_sample *sample) 1162 1162 { 1163 - u64 sample_type = __perf_evlist__combined_sample_type(evlist); 1163 + u64 sample_type = __evlist__combined_sample_type(evlist); 1164 1164 1165 1165 if (event->header.type != PERF_RECORD_SAMPLE && 1166 1166 !perf_evlist__sample_id_all(evlist)) {