diff options
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
-rw-r--r-- | tools/perf/util/scripting-engines/trace-event-python.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 35dc5f3b581b..69aa93d4ee99 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
@@ -193,7 +193,7 @@ static void try_call_object(const char *handler_name, PyObject *args) | |||
193 | call_object(handler, args, handler_name); | 193 | call_object(handler, args, handler_name); |
194 | } | 194 | } |
195 | 195 | ||
196 | static void define_value(enum print_arg_type field_type, | 196 | static void define_value(enum tep_print_arg_type field_type, |
197 | const char *ev_name, | 197 | const char *ev_name, |
198 | const char *field_name, | 198 | const char *field_name, |
199 | const char *field_value, | 199 | const char *field_value, |
@@ -204,7 +204,7 @@ static void define_value(enum print_arg_type field_type, | |||
204 | unsigned long long value; | 204 | unsigned long long value; |
205 | unsigned n = 0; | 205 | unsigned n = 0; |
206 | 206 | ||
207 | if (field_type == PRINT_SYMBOL) | 207 | if (field_type == TEP_PRINT_SYMBOL) |
208 | handler_name = "define_symbolic_value"; | 208 | handler_name = "define_symbolic_value"; |
209 | 209 | ||
210 | t = PyTuple_New(4); | 210 | t = PyTuple_New(4); |
@@ -223,7 +223,7 @@ static void define_value(enum print_arg_type field_type, | |||
223 | Py_DECREF(t); | 223 | Py_DECREF(t); |
224 | } | 224 | } |
225 | 225 | ||
226 | static void define_values(enum print_arg_type field_type, | 226 | static void define_values(enum tep_print_arg_type field_type, |
227 | struct tep_print_flag_sym *field, | 227 | struct tep_print_flag_sym *field, |
228 | const char *ev_name, | 228 | const char *ev_name, |
229 | const char *field_name) | 229 | const char *field_name) |
@@ -235,7 +235,7 @@ static void define_values(enum print_arg_type field_type, | |||
235 | define_values(field_type, field->next, ev_name, field_name); | 235 | define_values(field_type, field->next, ev_name, field_name); |
236 | } | 236 | } |
237 | 237 | ||
238 | static void define_field(enum print_arg_type field_type, | 238 | static void define_field(enum tep_print_arg_type field_type, |
239 | const char *ev_name, | 239 | const char *ev_name, |
240 | const char *field_name, | 240 | const char *field_name, |
241 | const char *delim) | 241 | const char *delim) |
@@ -244,10 +244,10 @@ static void define_field(enum print_arg_type field_type, | |||
244 | PyObject *t; | 244 | PyObject *t; |
245 | unsigned n = 0; | 245 | unsigned n = 0; |
246 | 246 | ||
247 | if (field_type == PRINT_SYMBOL) | 247 | if (field_type == TEP_PRINT_SYMBOL) |
248 | handler_name = "define_symbolic_field"; | 248 | handler_name = "define_symbolic_field"; |
249 | 249 | ||
250 | if (field_type == PRINT_FLAGS) | 250 | if (field_type == TEP_PRINT_FLAGS) |
251 | t = PyTuple_New(3); | 251 | t = PyTuple_New(3); |
252 | else | 252 | else |
253 | t = PyTuple_New(2); | 253 | t = PyTuple_New(2); |
@@ -256,7 +256,7 @@ static void define_field(enum print_arg_type field_type, | |||
256 | 256 | ||
257 | PyTuple_SetItem(t, n++, _PyUnicode_FromString(ev_name)); | 257 | PyTuple_SetItem(t, n++, _PyUnicode_FromString(ev_name)); |
258 | PyTuple_SetItem(t, n++, _PyUnicode_FromString(field_name)); | 258 | PyTuple_SetItem(t, n++, _PyUnicode_FromString(field_name)); |
259 | if (field_type == PRINT_FLAGS) | 259 | if (field_type == TEP_PRINT_FLAGS) |
260 | PyTuple_SetItem(t, n++, _PyUnicode_FromString(delim)); | 260 | PyTuple_SetItem(t, n++, _PyUnicode_FromString(delim)); |
261 | 261 | ||
262 | try_call_object(handler_name, t); | 262 | try_call_object(handler_name, t); |
@@ -272,46 +272,46 @@ static void define_event_symbols(struct tep_event_format *event, | |||
272 | return; | 272 | return; |
273 | 273 | ||
274 | switch (args->type) { | 274 | switch (args->type) { |
275 | case PRINT_NULL: | 275 | case TEP_PRINT_NULL: |
276 | break; | 276 | break; |
277 | case PRINT_ATOM: | 277 | case TEP_PRINT_ATOM: |
278 | define_value(PRINT_FLAGS, ev_name, cur_field_name, "0", | 278 | define_value(TEP_PRINT_FLAGS, ev_name, cur_field_name, "0", |
279 | args->atom.atom); | 279 | args->atom.atom); |
280 | zero_flag_atom = 0; | 280 | zero_flag_atom = 0; |
281 | break; | 281 | break; |
282 | case PRINT_FIELD: | 282 | case TEP_PRINT_FIELD: |
283 | free(cur_field_name); | 283 | free(cur_field_name); |
284 | cur_field_name = strdup(args->field.name); | 284 | cur_field_name = strdup(args->field.name); |
285 | break; | 285 | break; |
286 | case PRINT_FLAGS: | 286 | case TEP_PRINT_FLAGS: |
287 | define_event_symbols(event, ev_name, args->flags.field); | 287 | define_event_symbols(event, ev_name, args->flags.field); |
288 | define_field(PRINT_FLAGS, ev_name, cur_field_name, | 288 | define_field(TEP_PRINT_FLAGS, ev_name, cur_field_name, |
289 | args->flags.delim); | 289 | args->flags.delim); |
290 | define_values(PRINT_FLAGS, args->flags.flags, ev_name, | 290 | define_values(TEP_PRINT_FLAGS, args->flags.flags, ev_name, |
291 | cur_field_name); | 291 | cur_field_name); |
292 | break; | 292 | break; |
293 | case PRINT_SYMBOL: | 293 | case TEP_PRINT_SYMBOL: |
294 | define_event_symbols(event, ev_name, args->symbol.field); | 294 | define_event_symbols(event, ev_name, args->symbol.field); |
295 | define_field(PRINT_SYMBOL, ev_name, cur_field_name, NULL); | 295 | define_field(TEP_PRINT_SYMBOL, ev_name, cur_field_name, NULL); |
296 | define_values(PRINT_SYMBOL, args->symbol.symbols, ev_name, | 296 | define_values(TEP_PRINT_SYMBOL, args->symbol.symbols, ev_name, |
297 | cur_field_name); | 297 | cur_field_name); |
298 | break; | 298 | break; |
299 | case PRINT_HEX: | 299 | case TEP_PRINT_HEX: |
300 | case PRINT_HEX_STR: | 300 | case TEP_PRINT_HEX_STR: |
301 | define_event_symbols(event, ev_name, args->hex.field); | 301 | define_event_symbols(event, ev_name, args->hex.field); |
302 | define_event_symbols(event, ev_name, args->hex.size); | 302 | define_event_symbols(event, ev_name, args->hex.size); |
303 | break; | 303 | break; |
304 | case PRINT_INT_ARRAY: | 304 | case TEP_PRINT_INT_ARRAY: |
305 | define_event_symbols(event, ev_name, args->int_array.field); | 305 | define_event_symbols(event, ev_name, args->int_array.field); |
306 | define_event_symbols(event, ev_name, args->int_array.count); | 306 | define_event_symbols(event, ev_name, args->int_array.count); |
307 | define_event_symbols(event, ev_name, args->int_array.el_size); | 307 | define_event_symbols(event, ev_name, args->int_array.el_size); |
308 | break; | 308 | break; |
309 | case PRINT_STRING: | 309 | case TEP_PRINT_STRING: |
310 | break; | 310 | break; |
311 | case PRINT_TYPE: | 311 | case TEP_PRINT_TYPE: |
312 | define_event_symbols(event, ev_name, args->typecast.item); | 312 | define_event_symbols(event, ev_name, args->typecast.item); |
313 | break; | 313 | break; |
314 | case PRINT_OP: | 314 | case TEP_PRINT_OP: |
315 | if (strcmp(args->op.op, ":") == 0) | 315 | if (strcmp(args->op.op, ":") == 0) |
316 | zero_flag_atom = 1; | 316 | zero_flag_atom = 1; |
317 | define_event_symbols(event, ev_name, args->op.left); | 317 | define_event_symbols(event, ev_name, args->op.left); |
@@ -319,11 +319,11 @@ static void define_event_symbols(struct tep_event_format *event, | |||
319 | break; | 319 | break; |
320 | default: | 320 | default: |
321 | /* gcc warns for these? */ | 321 | /* gcc warns for these? */ |
322 | case PRINT_BSTRING: | 322 | case TEP_PRINT_BSTRING: |
323 | case PRINT_DYNAMIC_ARRAY: | 323 | case TEP_PRINT_DYNAMIC_ARRAY: |
324 | case PRINT_DYNAMIC_ARRAY_LEN: | 324 | case TEP_PRINT_DYNAMIC_ARRAY_LEN: |
325 | case PRINT_FUNC: | 325 | case TEP_PRINT_FUNC: |
326 | case PRINT_BITMASK: | 326 | case TEP_PRINT_BITMASK: |
327 | /* we should warn... */ | 327 | /* we should warn... */ |
328 | return; | 328 | return; |
329 | } | 329 | } |