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

perf tools, tools lib traceevent: Rename "pevent" member of struct tep_event to "tep"

The member "pevent" of the struct tep_event is renamed to "tep". This
makes the struct consistent with the chosen naming convention:

tep (trace event parser), instead of the old pevent.

Signed-off-by: Tzvetomir Stoyanov <tstoyanov@vmware.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/linux-trace-devel/20190401132111.13727-3-tstoyanov@vmware.com
Link: http://lkml.kernel.org/r/20190401164344.627724996@goodmis.org
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Tzvetomir Stoyanov and committed by
Arnaldo Carvalho de Melo
69769ce1 047ff221

+33 -33
+16 -16
tools/lib/traceevent/event-parse.c
··· 804 804 pevent->events[i] = event; 805 805 pevent->nr_events++; 806 806 807 - event->pevent = pevent; 807 + event->tep = pevent; 808 808 809 809 return 0; 810 810 } ··· 1656 1656 else if (field->flags & TEP_FIELD_IS_STRING) 1657 1657 field->elementsize = 1; 1658 1658 else if (field->flags & TEP_FIELD_IS_LONG) 1659 - field->elementsize = event->pevent ? 1660 - event->pevent->long_size : 1659 + field->elementsize = event->tep ? 1660 + event->tep->long_size : 1661 1661 sizeof(long); 1662 1662 } else 1663 1663 field->elementsize = field->size; ··· 3075 3075 return process_dynamic_array_len(event, arg, tok); 3076 3076 } 3077 3077 3078 - func = find_func_handler(event->pevent, token); 3078 + func = find_func_handler(event->tep, token); 3079 3079 if (func) { 3080 3080 free_token(token); 3081 3081 return process_func_handler(event, func, arg, tok); ··· 3405 3405 case 2: 3406 3406 case 4: 3407 3407 case 8: 3408 - *value = tep_read_number(field->event->pevent, 3408 + *value = tep_read_number(field->event->tep, 3409 3409 data + field->offset, field->size); 3410 3410 return 0; 3411 3411 default: ··· 3566 3566 static unsigned long long 3567 3567 eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg *arg) 3568 3568 { 3569 - struct tep_handle *pevent = event->pevent; 3569 + struct tep_handle *pevent = event->tep; 3570 3570 unsigned long long val = 0; 3571 3571 unsigned long long left, right; 3572 3572 struct tep_print_arg *typearg = NULL; ··· 3907 3907 struct tep_event *event, const char *format, 3908 3908 int len_arg, struct tep_print_arg *arg) 3909 3909 { 3910 - struct tep_handle *pevent = event->pevent; 3910 + struct tep_handle *pevent = event->tep; 3911 3911 struct tep_print_flag_sym *flag; 3912 3912 struct tep_format_field *field; 3913 3913 struct printk_map *printk; ··· 4256 4256 4257 4257 static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, struct tep_event *event) 4258 4258 { 4259 - struct tep_handle *pevent = event->pevent; 4259 + struct tep_handle *pevent = event->tep; 4260 4260 struct tep_format_field *field, *ip_field; 4261 4261 struct tep_print_arg *args, *arg, **next; 4262 4262 unsigned long long ip, val; ··· 4434 4434 get_bprint_format(void *data, int size __maybe_unused, 4435 4435 struct tep_event *event) 4436 4436 { 4437 - struct tep_handle *pevent = event->pevent; 4437 + struct tep_handle *pevent = event->tep; 4438 4438 unsigned long long addr; 4439 4439 struct tep_format_field *field; 4440 4440 struct printk_map *printk; ··· 4835 4835 { 4836 4836 unsigned long long val; 4837 4837 unsigned int offset, len, i; 4838 - struct tep_handle *pevent = field->event->pevent; 4838 + struct tep_handle *pevent = field->event->tep; 4839 4839 4840 4840 if (field->flags & TEP_FIELD_IS_ARRAY) { 4841 4841 offset = field->offset; ··· 4910 4910 4911 4911 static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_event *event) 4912 4912 { 4913 - struct tep_handle *pevent = event->pevent; 4913 + struct tep_handle *pevent = event->tep; 4914 4914 struct tep_print_fmt *print_fmt = &event->print_fmt; 4915 4915 struct tep_print_arg *arg = print_fmt->args; 4916 4916 struct tep_print_arg *args = NULL; ··· 5424 5424 { 5425 5425 int print_pretty = 1; 5426 5426 5427 - if (event->pevent->print_raw || (event->flags & TEP_EVENT_FL_PRINTRAW)) 5427 + if (event->tep->print_raw || (event->flags & TEP_EVENT_FL_PRINTRAW)) 5428 5428 tep_print_fields(s, record->data, record->size, event); 5429 5429 else { 5430 5430 ··· 6163 6163 } 6164 6164 6165 6165 /* Add pevent to event so that it can be referenced */ 6166 - event->pevent = pevent; 6166 + event->tep = pevent; 6167 6167 6168 6168 ret = event_read_format(event); 6169 6169 if (ret < 0) { ··· 6357 6357 6358 6358 offset = field->offset; 6359 6359 if (field->flags & TEP_FIELD_IS_DYNAMIC) { 6360 - offset = tep_read_number(event->pevent, 6361 - data + offset, field->size); 6360 + offset = tep_read_number(event->tep, 6361 + data + offset, field->size); 6362 6362 *len = offset >> 16; 6363 6363 offset &= 0xffff; 6364 6364 } else ··· 6492 6492 struct tep_record *record, int err) 6493 6493 { 6494 6494 struct tep_format_field *field = tep_find_field(event, name); 6495 - struct tep_handle *pevent = event->pevent; 6495 + struct tep_handle *pevent = event->tep; 6496 6496 unsigned long long val; 6497 6497 struct func_map *func; 6498 6498 char tmp[128];
+1 -1
tools/lib/traceevent/event-parse.h
··· 278 278 }; 279 279 280 280 struct tep_event { 281 - struct tep_handle *pevent; 281 + struct tep_handle *tep; 282 282 char *name; 283 283 int id; 284 284 int flags;
+3 -3
tools/lib/traceevent/parse-filter.c
··· 1528 1528 const char *comm; 1529 1529 int pid; 1530 1530 1531 - pid = tep_data_pid(event->pevent, record); 1532 - comm = tep_data_comm_from_pid(event->pevent, pid); 1531 + pid = tep_data_pid(event->tep, record); 1532 + comm = tep_data_comm_from_pid(event->tep, pid); 1533 1533 return comm; 1534 1534 } 1535 1535 ··· 1727 1727 1728 1728 } else { 1729 1729 event = arg->str.field->event; 1730 - pevent = event->pevent; 1730 + pevent = event->tep; 1731 1731 addr = get_value(event, arg->str.field, record); 1732 1732 1733 1733 if (arg->str.field->flags & (TEP_FIELD_IS_POINTER | TEP_FIELD_IS_LONG))
+1 -1
tools/lib/traceevent/plugin_function.c
··· 126 126 static int function_handler(struct trace_seq *s, struct tep_record *record, 127 127 struct tep_event *event, void *context) 128 128 { 129 - struct tep_handle *pevent = event->pevent; 129 + struct tep_handle *pevent = event->tep; 130 130 unsigned long long function; 131 131 unsigned long long pfunction; 132 132 const char *func;
+2 -2
tools/lib/traceevent/plugin_kmem.c
··· 39 39 if (tep_read_number_field(field, data, &val)) 40 40 return 1; 41 41 42 - func = tep_find_function(event->pevent, val); 42 + func = tep_find_function(event->tep, val); 43 43 if (!func) 44 44 return 1; 45 45 46 - addr = tep_find_function_address(event->pevent, val); 46 + addr = tep_find_function_address(event->tep, val); 47 47 48 48 trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr)); 49 49 return 1;
+2 -2
tools/lib/traceevent/plugin_kvm.c
··· 389 389 * We can only use the structure if file is of the same 390 390 * endianness. 391 391 */ 392 - if (tep_is_file_bigendian(event->pevent) == 393 - tep_is_local_bigendian(event->pevent)) { 392 + if (tep_is_file_bigendian(event->tep) == 393 + tep_is_local_bigendian(event->tep)) { 394 394 395 395 trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", 396 396 role.level,
+1 -1
tools/lib/traceevent/plugin_sched_switch.c
··· 62 62 comm = &s->buffer[len]; 63 63 64 64 /* Help out the comm to ids. This will handle dups */ 65 - tep_register_comm(field->event->pevent, comm, pid); 65 + tep_register_comm(field->event->tep, comm, pid); 66 66 } 67 67 68 68 static int sched_wakeup_handler(struct trace_seq *s,
+1 -1
tools/perf/builtin-kmem.c
··· 1975 1975 goto out_delete; 1976 1976 } 1977 1977 1978 - kmem_page_size = tep_get_page_size(evsel->tp_format->pevent); 1978 + kmem_page_size = tep_get_page_size(evsel->tp_format->tep); 1979 1979 symbol_conf.use_callchain = true; 1980 1980 } 1981 1981
+2 -2
tools/perf/util/data-convert-bt.c
··· 310 310 if (flags & TEP_FIELD_IS_DYNAMIC) { 311 311 unsigned long long tmp_val; 312 312 313 - tmp_val = tep_read_number(fmtf->event->pevent, 313 + tmp_val = tep_read_number(fmtf->event->tep, 314 314 data + offset, len); 315 315 offset = tmp_val; 316 316 len = offset >> 16; ··· 354 354 unsigned long long value_int; 355 355 356 356 value_int = tep_read_number( 357 - fmtf->event->pevent, 357 + fmtf->event->tep, 358 358 data + offset + i * len, len); 359 359 360 360 if (!(flags & TEP_FIELD_IS_SIGNED))
+1 -1
tools/perf/util/python.c
··· 342 342 static PyObject* 343 343 tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field) 344 344 { 345 - struct tep_handle *pevent = field->event->pevent; 345 + struct tep_handle *pevent = field->event->tep; 346 346 void *data = pe->sample.raw_data; 347 347 PyObject *ret = NULL; 348 348 unsigned long long val;
+1 -1
tools/perf/util/scripting-engines/trace-event-perl.c
··· 372 372 ns = nsecs - s * NSEC_PER_SEC; 373 373 374 374 scripting_context->event_data = data; 375 - scripting_context->pevent = evsel->tp_format->pevent; 375 + scripting_context->pevent = evsel->tp_format->tep; 376 376 377 377 ENTER; 378 378 SAVETMPS;
+1 -1
tools/perf/util/scripting-engines/trace-event-python.c
··· 837 837 ns = nsecs - s * NSEC_PER_SEC; 838 838 839 839 scripting_context->event_data = data; 840 - scripting_context->pevent = evsel->tp_format->pevent; 840 + scripting_context->pevent = evsel->tp_format->tep; 841 841 842 842 context = _PyCapsule_New(scripting_context, NULL, NULL); 843 843
+1 -1
tools/perf/util/trace-event-parse.c
··· 111 111 112 112 unsigned long long read_size(struct tep_event *event, void *ptr, int size) 113 113 { 114 - return tep_read_number(event->pevent, ptr, size); 114 + return tep_read_number(event->tep, ptr, size); 115 115 } 116 116 117 117 void event_format__fprintf(struct tep_event *event,