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 | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c index 69aa93d4ee99..87ef16a1b17e 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c | |||
| @@ -264,7 +264,7 @@ static void define_field(enum tep_print_arg_type field_type, | |||
| 264 | Py_DECREF(t); | 264 | Py_DECREF(t); |
| 265 | } | 265 | } |
| 266 | 266 | ||
| 267 | static void define_event_symbols(struct tep_event_format *event, | 267 | static void define_event_symbols(struct tep_event *event, |
| 268 | const char *ev_name, | 268 | const char *ev_name, |
| 269 | struct tep_print_arg *args) | 269 | struct tep_print_arg *args) |
| 270 | { | 270 | { |
| @@ -332,7 +332,7 @@ static void define_event_symbols(struct tep_event_format *event, | |||
| 332 | define_event_symbols(event, ev_name, args->next); | 332 | define_event_symbols(event, ev_name, args->next); |
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | static PyObject *get_field_numeric_entry(struct tep_event_format *event, | 335 | static PyObject *get_field_numeric_entry(struct tep_event *event, |
| 336 | struct tep_format_field *field, void *data) | 336 | struct tep_format_field *field, void *data) |
| 337 | { | 337 | { |
| 338 | bool is_array = field->flags & TEP_FIELD_IS_ARRAY; | 338 | bool is_array = field->flags & TEP_FIELD_IS_ARRAY; |
| @@ -494,14 +494,14 @@ static PyObject *python_process_brstack(struct perf_sample *sample, | |||
| 494 | pydict_set_item_string_decref(pyelem, "cycles", | 494 | pydict_set_item_string_decref(pyelem, "cycles", |
| 495 | PyLong_FromUnsignedLongLong(br->entries[i].flags.cycles)); | 495 | PyLong_FromUnsignedLongLong(br->entries[i].flags.cycles)); |
| 496 | 496 | ||
| 497 | thread__find_map(thread, sample->cpumode, | 497 | thread__find_map_fb(thread, sample->cpumode, |
| 498 | br->entries[i].from, &al); | 498 | br->entries[i].from, &al); |
| 499 | dsoname = get_dsoname(al.map); | 499 | dsoname = get_dsoname(al.map); |
| 500 | pydict_set_item_string_decref(pyelem, "from_dsoname", | 500 | pydict_set_item_string_decref(pyelem, "from_dsoname", |
| 501 | _PyUnicode_FromString(dsoname)); | 501 | _PyUnicode_FromString(dsoname)); |
| 502 | 502 | ||
| 503 | thread__find_map(thread, sample->cpumode, | 503 | thread__find_map_fb(thread, sample->cpumode, |
| 504 | br->entries[i].to, &al); | 504 | br->entries[i].to, &al); |
| 505 | dsoname = get_dsoname(al.map); | 505 | dsoname = get_dsoname(al.map); |
| 506 | pydict_set_item_string_decref(pyelem, "to_dsoname", | 506 | pydict_set_item_string_decref(pyelem, "to_dsoname", |
| 507 | _PyUnicode_FromString(dsoname)); | 507 | _PyUnicode_FromString(dsoname)); |
| @@ -576,14 +576,14 @@ static PyObject *python_process_brstacksym(struct perf_sample *sample, | |||
| 576 | if (!pyelem) | 576 | if (!pyelem) |
| 577 | Py_FatalError("couldn't create Python dictionary"); | 577 | Py_FatalError("couldn't create Python dictionary"); |
| 578 | 578 | ||
| 579 | thread__find_symbol(thread, sample->cpumode, | 579 | thread__find_symbol_fb(thread, sample->cpumode, |
| 580 | br->entries[i].from, &al); | 580 | br->entries[i].from, &al); |
| 581 | get_symoff(al.sym, &al, true, bf, sizeof(bf)); | 581 | get_symoff(al.sym, &al, true, bf, sizeof(bf)); |
| 582 | pydict_set_item_string_decref(pyelem, "from", | 582 | pydict_set_item_string_decref(pyelem, "from", |
| 583 | _PyUnicode_FromString(bf)); | 583 | _PyUnicode_FromString(bf)); |
| 584 | 584 | ||
| 585 | thread__find_symbol(thread, sample->cpumode, | 585 | thread__find_symbol_fb(thread, sample->cpumode, |
| 586 | br->entries[i].to, &al); | 586 | br->entries[i].to, &al); |
| 587 | get_symoff(al.sym, &al, true, bf, sizeof(bf)); | 587 | get_symoff(al.sym, &al, true, bf, sizeof(bf)); |
| 588 | pydict_set_item_string_decref(pyelem, "to", | 588 | pydict_set_item_string_decref(pyelem, "to", |
| 589 | _PyUnicode_FromString(bf)); | 589 | _PyUnicode_FromString(bf)); |
| @@ -790,7 +790,7 @@ static void python_process_tracepoint(struct perf_sample *sample, | |||
| 790 | struct perf_evsel *evsel, | 790 | struct perf_evsel *evsel, |
| 791 | struct addr_location *al) | 791 | struct addr_location *al) |
| 792 | { | 792 | { |
| 793 | struct tep_event_format *event = evsel->tp_format; | 793 | struct tep_event *event = evsel->tp_format; |
| 794 | PyObject *handler, *context, *t, *obj = NULL, *callchain; | 794 | PyObject *handler, *context, *t, *obj = NULL, *callchain; |
| 795 | PyObject *dict = NULL, *all_entries_dict = NULL; | 795 | PyObject *dict = NULL, *all_entries_dict = NULL; |
| 796 | static char handler_name[256]; | 796 | static char handler_name[256]; |
| @@ -1590,7 +1590,7 @@ static int python_stop_script(void) | |||
| 1590 | 1590 | ||
| 1591 | static int python_generate_script(struct tep_handle *pevent, const char *outfile) | 1591 | static int python_generate_script(struct tep_handle *pevent, const char *outfile) |
| 1592 | { | 1592 | { |
| 1593 | struct tep_event_format *event = NULL; | 1593 | struct tep_event *event = NULL; |
| 1594 | struct tep_format_field *f; | 1594 | struct tep_format_field *f; |
| 1595 | char fname[PATH_MAX]; | 1595 | char fname[PATH_MAX]; |
| 1596 | int not_first, count; | 1596 | int not_first, count; |
