aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTzvetomir Stoyanov <tstoyanov@vmware.com>2019-04-01 12:43:18 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-04-01 14:18:10 -0400
commit69769ce159cbfd7567815a86cfc3ea63423de61b (patch)
tree8b3e0e4daca45e0db9780edccf752dca3bb3deae
parent047ff221e3ab07129a3566683e95a4d142f7c3c0 (diff)
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>
-rw-r--r--tools/lib/traceevent/event-parse.c32
-rw-r--r--tools/lib/traceevent/event-parse.h2
-rw-r--r--tools/lib/traceevent/parse-filter.c6
-rw-r--r--tools/lib/traceevent/plugin_function.c2
-rw-r--r--tools/lib/traceevent/plugin_kmem.c4
-rw-r--r--tools/lib/traceevent/plugin_kvm.c4
-rw-r--r--tools/lib/traceevent/plugin_sched_switch.c2
-rw-r--r--tools/perf/builtin-kmem.c2
-rw-r--r--tools/perf/util/data-convert-bt.c4
-rw-r--r--tools/perf/util/python.c2
-rw-r--r--tools/perf/util/scripting-engines/trace-event-perl.c2
-rw-r--r--tools/perf/util/scripting-engines/trace-event-python.c2
-rw-r--r--tools/perf/util/trace-event-parse.c2
13 files changed, 33 insertions, 33 deletions
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index ceefa9b3d726..70ea638156f2 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -804,7 +804,7 @@ static int add_event(struct tep_handle *pevent, struct tep_event *event)
804 pevent->events[i] = event; 804 pevent->events[i] = event;
805 pevent->nr_events++; 805 pevent->nr_events++;
806 806
807 event->pevent = pevent; 807 event->tep = pevent;
808 808
809 return 0; 809 return 0;
810} 810}
@@ -1656,8 +1656,8 @@ static int event_read_fields(struct tep_event *event, struct tep_format_field **
1656 else if (field->flags & TEP_FIELD_IS_STRING) 1656 else if (field->flags & TEP_FIELD_IS_STRING)
1657 field->elementsize = 1; 1657 field->elementsize = 1;
1658 else if (field->flags & TEP_FIELD_IS_LONG) 1658 else if (field->flags & TEP_FIELD_IS_LONG)
1659 field->elementsize = event->pevent ? 1659 field->elementsize = event->tep ?
1660 event->pevent->long_size : 1660 event->tep->long_size :
1661 sizeof(long); 1661 sizeof(long);
1662 } else 1662 } else
1663 field->elementsize = field->size; 1663 field->elementsize = field->size;
@@ -3075,7 +3075,7 @@ process_function(struct tep_event *event, struct tep_print_arg *arg,
3075 return process_dynamic_array_len(event, arg, tok); 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 if (func) { 3079 if (func) {
3080 free_token(token); 3080 free_token(token);
3081 return process_func_handler(event, func, arg, tok); 3081 return process_func_handler(event, func, arg, tok);
@@ -3405,7 +3405,7 @@ int tep_read_number_field(struct tep_format_field *field, const void *data,
3405 case 2: 3405 case 2:
3406 case 4: 3406 case 4:
3407 case 8: 3407 case 8:
3408 *value = tep_read_number(field->event->pevent, 3408 *value = tep_read_number(field->event->tep,
3409 data + field->offset, field->size); 3409 data + field->offset, field->size);
3410 return 0; 3410 return 0;
3411 default: 3411 default:
@@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,
3566static unsigned long long 3566static unsigned long long
3567eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg *arg) 3567eval_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 unsigned long long val = 0; 3570 unsigned long long val = 0;
3571 unsigned long long left, right; 3571 unsigned long long left, right;
3572 struct tep_print_arg *typearg = NULL; 3572 struct tep_print_arg *typearg = NULL;
@@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
3907 struct tep_event *event, const char *format, 3907 struct tep_event *event, const char *format,
3908 int len_arg, struct tep_print_arg *arg) 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 struct tep_print_flag_sym *flag; 3911 struct tep_print_flag_sym *flag;
3912 struct tep_format_field *field; 3912 struct tep_format_field *field;
3913 struct printk_map *printk; 3913 struct printk_map *printk;
@@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)
4256 4256
4257static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, struct tep_event *event) 4257static 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 struct tep_format_field *field, *ip_field; 4260 struct tep_format_field *field, *ip_field;
4261 struct tep_print_arg *args, *arg, **next; 4261 struct tep_print_arg *args, *arg, **next;
4262 unsigned long long ip, val; 4262 unsigned long long ip, val;
@@ -4434,7 +4434,7 @@ static char *
4434get_bprint_format(void *data, int size __maybe_unused, 4434get_bprint_format(void *data, int size __maybe_unused,
4435 struct tep_event *event) 4435 struct tep_event *event)
4436{ 4436{
4437 struct tep_handle *pevent = event->pevent; 4437 struct tep_handle *pevent = event->tep;
4438 unsigned long long addr; 4438 unsigned long long addr;
4439 struct tep_format_field *field; 4439 struct tep_format_field *field;
4440 struct printk_map *printk; 4440 struct printk_map *printk;
@@ -4835,7 +4835,7 @@ void tep_print_field(struct trace_seq *s, void *data,
4835{ 4835{
4836 unsigned long long val; 4836 unsigned long long val;
4837 unsigned int offset, len, i; 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 if (field->flags & TEP_FIELD_IS_ARRAY) { 4840 if (field->flags & TEP_FIELD_IS_ARRAY) {
4841 offset = field->offset; 4841 offset = field->offset;
@@ -4910,7 +4910,7 @@ void tep_print_fields(struct trace_seq *s, void *data,
4910 4910
4911static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_event *event) 4911static 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 struct tep_print_fmt *print_fmt = &event->print_fmt; 4914 struct tep_print_fmt *print_fmt = &event->print_fmt;
4915 struct tep_print_arg *arg = print_fmt->args; 4915 struct tep_print_arg *arg = print_fmt->args;
4916 struct tep_print_arg *args = NULL; 4916 struct tep_print_arg *args = NULL;
@@ -5424,7 +5424,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event,
5424{ 5424{
5425 int print_pretty = 1; 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 tep_print_fields(s, record->data, record->size, event); 5428 tep_print_fields(s, record->data, record->size, event);
5429 else { 5429 else {
5430 5430
@@ -6163,7 +6163,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp,
6163 } 6163 }
6164 6164
6165 /* Add pevent to event so that it can be referenced */ 6165 /* Add pevent to event so that it can be referenced */
6166 event->pevent = pevent; 6166 event->tep = pevent;
6167 6167
6168 ret = event_read_format(event); 6168 ret = event_read_format(event);
6169 if (ret < 0) { 6169 if (ret < 0) {
@@ -6357,8 +6357,8 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event,
6357 6357
6358 offset = field->offset; 6358 offset = field->offset;
6359 if (field->flags & TEP_FIELD_IS_DYNAMIC) { 6359 if (field->flags & TEP_FIELD_IS_DYNAMIC) {
6360 offset = tep_read_number(event->pevent, 6360 offset = tep_read_number(event->tep,
6361 data + offset, field->size); 6361 data + offset, field->size);
6362 *len = offset >> 16; 6362 *len = offset >> 16;
6363 offset &= 0xffff; 6363 offset &= 0xffff;
6364 } else 6364 } else
@@ -6492,7 +6492,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,
6492 struct tep_record *record, int err) 6492 struct tep_record *record, int err)
6493{ 6493{
6494 struct tep_format_field *field = tep_find_field(event, name); 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 unsigned long long val; 6496 unsigned long long val;
6497 struct func_map *func; 6497 struct func_map *func;
6498 char tmp[128]; 6498 char tmp[128];
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 2720a30ef86b..de7ace173e75 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -278,7 +278,7 @@ struct tep_print_fmt {
278}; 278};
279 279
280struct tep_event { 280struct tep_event {
281 struct tep_handle *pevent; 281 struct tep_handle *tep;
282 char *name; 282 char *name;
283 int id; 283 int id;
284 int flags; 284 int flags;
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 5d8f9d9bc253..123358209297 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1528,8 +1528,8 @@ get_comm(struct tep_event *event, struct tep_record *record)
1528 const char *comm; 1528 const char *comm;
1529 int pid; 1529 int pid;
1530 1530
1531 pid = tep_data_pid(event->pevent, record); 1531 pid = tep_data_pid(event->tep, record);
1532 comm = tep_data_comm_from_pid(event->pevent, pid); 1532 comm = tep_data_comm_from_pid(event->tep, pid);
1533 return comm; 1533 return comm;
1534} 1534}
1535 1535
@@ -1727,7 +1727,7 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record *
1727 1727
1728 } else { 1728 } else {
1729 event = arg->str.field->event; 1729 event = arg->str.field->event;
1730 pevent = event->pevent; 1730 pevent = event->tep;
1731 addr = get_value(event, arg->str.field, record); 1731 addr = get_value(event, arg->str.field, record);
1732 1732
1733 if (arg->str.field->flags & (TEP_FIELD_IS_POINTER | TEP_FIELD_IS_LONG)) 1733 if (arg->str.field->flags & (TEP_FIELD_IS_POINTER | TEP_FIELD_IS_LONG))
diff --git a/tools/lib/traceevent/plugin_function.c b/tools/lib/traceevent/plugin_function.c
index e93f33bd705f..d6a8df060614 100644
--- a/tools/lib/traceevent/plugin_function.c
+++ b/tools/lib/traceevent/plugin_function.c
@@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)
126static int function_handler(struct trace_seq *s, struct tep_record *record, 126static int function_handler(struct trace_seq *s, struct tep_record *record,
127 struct tep_event *event, void *context) 127 struct tep_event *event, void *context)
128{ 128{
129 struct tep_handle *pevent = event->pevent; 129 struct tep_handle *pevent = event->tep;
130 unsigned long long function; 130 unsigned long long function;
131 unsigned long long pfunction; 131 unsigned long long pfunction;
132 const char *func; 132 const char *func;
diff --git a/tools/lib/traceevent/plugin_kmem.c b/tools/lib/traceevent/plugin_kmem.c
index c09bafdd8377..edaec5d962c3 100644
--- a/tools/lib/traceevent/plugin_kmem.c
+++ b/tools/lib/traceevent/plugin_kmem.c
@@ -39,11 +39,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,
39 if (tep_read_number_field(field, data, &val)) 39 if (tep_read_number_field(field, data, &val))
40 return 1; 40 return 1;
41 41
42 func = tep_find_function(event->pevent, val); 42 func = tep_find_function(event->tep, val);
43 if (!func) 43 if (!func)
44 return 1; 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 trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr)); 48 trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr));
49 return 1; 49 return 1;
diff --git a/tools/lib/traceevent/plugin_kvm.c b/tools/lib/traceevent/plugin_kvm.c
index 472298c2b531..c8e623065a7e 100644
--- a/tools/lib/traceevent/plugin_kvm.c
+++ b/tools/lib/traceevent/plugin_kvm.c
@@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,
389 * We can only use the structure if file is of the same 389 * We can only use the structure if file is of the same
390 * endianness. 390 * endianness.
391 */ 391 */
392 if (tep_is_file_bigendian(event->pevent) == 392 if (tep_is_file_bigendian(event->tep) ==
393 tep_is_local_bigendian(event->pevent)) { 393 tep_is_local_bigendian(event->tep)) {
394 394
395 trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s", 395 trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s",
396 role.level, 396 role.level,
diff --git a/tools/lib/traceevent/plugin_sched_switch.c b/tools/lib/traceevent/plugin_sched_switch.c
index 701c22913cf8..957389a0ff7a 100644
--- a/tools/lib/traceevent/plugin_sched_switch.c
+++ b/tools/lib/traceevent/plugin_sched_switch.c
@@ -62,7 +62,7 @@ static void write_and_save_comm(struct tep_format_field *field,
62 comm = &s->buffer[len]; 62 comm = &s->buffer[len];
63 63
64 /* Help out the comm to ids. This will handle dups */ 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
68static int sched_wakeup_handler(struct trace_seq *s, 68static int sched_wakeup_handler(struct trace_seq *s,
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index fa520f4b8095..b80eee455111 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1975,7 +1975,7 @@ int cmd_kmem(int argc, const char **argv)
1975 goto out_delete; 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 symbol_conf.use_callchain = true; 1979 symbol_conf.use_callchain = true;
1980 } 1980 }
1981 1981
diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-convert-bt.c
index 26af43ad9ddd..e0311c9750ad 100644
--- a/tools/perf/util/data-convert-bt.c
+++ b/tools/perf/util/data-convert-bt.c
@@ -310,7 +310,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
310 if (flags & TEP_FIELD_IS_DYNAMIC) { 310 if (flags & TEP_FIELD_IS_DYNAMIC) {
311 unsigned long long tmp_val; 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 data + offset, len); 314 data + offset, len);
315 offset = tmp_val; 315 offset = tmp_val;
316 len = offset >> 16; 316 len = offset >> 16;
@@ -354,7 +354,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
354 unsigned long long value_int; 354 unsigned long long value_int;
355 355
356 value_int = tep_read_number( 356 value_int = tep_read_number(
357 fmtf->event->pevent, 357 fmtf->event->tep,
358 data + offset + i * len, len); 358 data + offset + i * len, len);
359 359
360 if (!(flags & TEP_FIELD_IS_SIGNED)) 360 if (!(flags & TEP_FIELD_IS_SIGNED))
diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c
index dda0ac978b1e..6aa7e2352e16 100644
--- a/tools/perf/util/python.c
+++ b/tools/perf/util/python.c
@@ -342,7 +342,7 @@ static bool is_tracepoint(struct pyrf_event *pevent)
342static PyObject* 342static PyObject*
343tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field) 343tracepoint_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 void *data = pe->sample.raw_data; 346 void *data = pe->sample.raw_data;
347 PyObject *ret = NULL; 347 PyObject *ret = NULL;
348 unsigned long long val; 348 unsigned long long val;
diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/perf/util/scripting-engines/trace-event-perl.c
index 5f06378a482b..61aa7f3df915 100644
--- a/tools/perf/util/scripting-engines/trace-event-perl.c
+++ b/tools/perf/util/scripting-engines/trace-event-perl.c
@@ -372,7 +372,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,
372 ns = nsecs - s * NSEC_PER_SEC; 372 ns = nsecs - s * NSEC_PER_SEC;
373 373
374 scripting_context->event_data = data; 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 ENTER; 377 ENTER;
378 SAVETMPS; 378 SAVETMPS;
diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 09604c6508f0..22f52b669871 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
837 ns = nsecs - s * NSEC_PER_SEC; 837 ns = nsecs - s * NSEC_PER_SEC;
838 838
839 scripting_context->event_data = data; 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 context = _PyCapsule_New(scripting_context, NULL, NULL); 842 context = _PyCapsule_New(scripting_context, NULL, NULL);
843 843
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index ad74be1f0e42..863955e4094e 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -111,7 +111,7 @@ raw_field_value(struct tep_event *event, const char *name, void *data)
111 111
112unsigned long long read_size(struct tep_event *event, void *ptr, int size) 112unsigned 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
117void event_format__fprintf(struct tep_event *event, 117void event_format__fprintf(struct tep_event *event,