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>
This commit is contained in:
Родитель
047ff221e3
Коммит
69769ce159
|
@ -804,7 +804,7 @@ static int add_event(struct tep_handle *pevent, struct tep_event *event)
|
|||
pevent->events[i] = event;
|
||||
pevent->nr_events++;
|
||||
|
||||
event->pevent = pevent;
|
||||
event->tep = pevent;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -1656,8 +1656,8 @@ static int event_read_fields(struct tep_event *event, struct tep_format_field **
|
|||
else if (field->flags & TEP_FIELD_IS_STRING)
|
||||
field->elementsize = 1;
|
||||
else if (field->flags & TEP_FIELD_IS_LONG)
|
||||
field->elementsize = event->pevent ?
|
||||
event->pevent->long_size :
|
||||
field->elementsize = event->tep ?
|
||||
event->tep->long_size :
|
||||
sizeof(long);
|
||||
} else
|
||||
field->elementsize = field->size;
|
||||
|
@ -3075,7 +3075,7 @@ process_function(struct tep_event *event, struct tep_print_arg *arg,
|
|||
return process_dynamic_array_len(event, arg, tok);
|
||||
}
|
||||
|
||||
func = find_func_handler(event->pevent, token);
|
||||
func = find_func_handler(event->tep, token);
|
||||
if (func) {
|
||||
free_token(token);
|
||||
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,
|
|||
case 2:
|
||||
case 4:
|
||||
case 8:
|
||||
*value = tep_read_number(field->event->pevent,
|
||||
*value = tep_read_number(field->event->tep,
|
||||
data + field->offset, field->size);
|
||||
return 0;
|
||||
default:
|
||||
|
@ -3566,7 +3566,7 @@ tep_find_event_by_name(struct tep_handle *tep,
|
|||
static unsigned long long
|
||||
eval_num_arg(void *data, int size, struct tep_event *event, struct tep_print_arg *arg)
|
||||
{
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
unsigned long long val = 0;
|
||||
unsigned long long left, right;
|
||||
struct tep_print_arg *typearg = NULL;
|
||||
|
@ -3907,7 +3907,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
|
|||
struct tep_event *event, const char *format,
|
||||
int len_arg, struct tep_print_arg *arg)
|
||||
{
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
struct tep_print_flag_sym *flag;
|
||||
struct tep_format_field *field;
|
||||
struct printk_map *printk;
|
||||
|
@ -4256,7 +4256,7 @@ static void free_args(struct tep_print_arg *args)
|
|||
|
||||
static struct tep_print_arg *make_bprint_args(char *fmt, void *data, int size, struct tep_event *event)
|
||||
{
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
struct tep_format_field *field, *ip_field;
|
||||
struct tep_print_arg *args, *arg, **next;
|
||||
unsigned long long ip, val;
|
||||
|
@ -4434,7 +4434,7 @@ static char *
|
|||
get_bprint_format(void *data, int size __maybe_unused,
|
||||
struct tep_event *event)
|
||||
{
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
unsigned long long addr;
|
||||
struct tep_format_field *field;
|
||||
struct printk_map *printk;
|
||||
|
@ -4835,7 +4835,7 @@ void tep_print_field(struct trace_seq *s, void *data,
|
|||
{
|
||||
unsigned long long val;
|
||||
unsigned int offset, len, i;
|
||||
struct tep_handle *pevent = field->event->pevent;
|
||||
struct tep_handle *pevent = field->event->tep;
|
||||
|
||||
if (field->flags & TEP_FIELD_IS_ARRAY) {
|
||||
offset = field->offset;
|
||||
|
@ -4910,7 +4910,7 @@ void tep_print_fields(struct trace_seq *s, void *data,
|
|||
|
||||
static void pretty_print(struct trace_seq *s, void *data, int size, struct tep_event *event)
|
||||
{
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
struct tep_print_fmt *print_fmt = &event->print_fmt;
|
||||
struct tep_print_arg *arg = print_fmt->args;
|
||||
struct tep_print_arg *args = NULL;
|
||||
|
@ -5424,7 +5424,7 @@ void tep_event_info(struct trace_seq *s, struct tep_event *event,
|
|||
{
|
||||
int print_pretty = 1;
|
||||
|
||||
if (event->pevent->print_raw || (event->flags & TEP_EVENT_FL_PRINTRAW))
|
||||
if (event->tep->print_raw || (event->flags & TEP_EVENT_FL_PRINTRAW))
|
||||
tep_print_fields(s, record->data, record->size, event);
|
||||
else {
|
||||
|
||||
|
@ -6163,7 +6163,7 @@ enum tep_errno __tep_parse_format(struct tep_event **eventp,
|
|||
}
|
||||
|
||||
/* Add pevent to event so that it can be referenced */
|
||||
event->pevent = pevent;
|
||||
event->tep = pevent;
|
||||
|
||||
ret = event_read_format(event);
|
||||
if (ret < 0) {
|
||||
|
@ -6357,8 +6357,8 @@ void *tep_get_field_raw(struct trace_seq *s, struct tep_event *event,
|
|||
|
||||
offset = field->offset;
|
||||
if (field->flags & TEP_FIELD_IS_DYNAMIC) {
|
||||
offset = tep_read_number(event->pevent,
|
||||
data + offset, field->size);
|
||||
offset = tep_read_number(event->tep,
|
||||
data + offset, field->size);
|
||||
*len = offset >> 16;
|
||||
offset &= 0xffff;
|
||||
} else
|
||||
|
@ -6492,7 +6492,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,
|
|||
struct tep_record *record, int err)
|
||||
{
|
||||
struct tep_format_field *field = tep_find_field(event, name);
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
unsigned long long val;
|
||||
struct func_map *func;
|
||||
char tmp[128];
|
||||
|
|
|
@ -278,7 +278,7 @@ struct tep_print_fmt {
|
|||
};
|
||||
|
||||
struct tep_event {
|
||||
struct tep_handle *pevent;
|
||||
struct tep_handle *tep;
|
||||
char *name;
|
||||
int id;
|
||||
int flags;
|
||||
|
|
|
@ -1528,8 +1528,8 @@ get_comm(struct tep_event *event, struct tep_record *record)
|
|||
const char *comm;
|
||||
int pid;
|
||||
|
||||
pid = tep_data_pid(event->pevent, record);
|
||||
comm = tep_data_comm_from_pid(event->pevent, pid);
|
||||
pid = tep_data_pid(event->tep, record);
|
||||
comm = tep_data_comm_from_pid(event->tep, pid);
|
||||
return comm;
|
||||
}
|
||||
|
||||
|
@ -1727,7 +1727,7 @@ static const char *get_field_str(struct tep_filter_arg *arg, struct tep_record *
|
|||
|
||||
} else {
|
||||
event = arg->str.field->event;
|
||||
pevent = event->pevent;
|
||||
pevent = event->tep;
|
||||
addr = get_value(event, arg->str.field, record);
|
||||
|
||||
if (arg->str.field->flags & (TEP_FIELD_IS_POINTER | TEP_FIELD_IS_LONG))
|
||||
|
|
|
@ -126,7 +126,7 @@ static int add_and_get_index(const char *parent, const char *child, int cpu)
|
|||
static int function_handler(struct trace_seq *s, struct tep_record *record,
|
||||
struct tep_event *event, void *context)
|
||||
{
|
||||
struct tep_handle *pevent = event->pevent;
|
||||
struct tep_handle *pevent = event->tep;
|
||||
unsigned long long function;
|
||||
unsigned long long pfunction;
|
||||
const char *func;
|
||||
|
|
|
@ -39,11 +39,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,
|
|||
if (tep_read_number_field(field, data, &val))
|
||||
return 1;
|
||||
|
||||
func = tep_find_function(event->pevent, val);
|
||||
func = tep_find_function(event->tep, val);
|
||||
if (!func)
|
||||
return 1;
|
||||
|
||||
addr = tep_find_function_address(event->pevent, val);
|
||||
addr = tep_find_function_address(event->tep, val);
|
||||
|
||||
trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr));
|
||||
return 1;
|
||||
|
|
|
@ -389,8 +389,8 @@ static int kvm_mmu_print_role(struct trace_seq *s, struct tep_record *record,
|
|||
* We can only use the structure if file is of the same
|
||||
* endianness.
|
||||
*/
|
||||
if (tep_is_file_bigendian(event->pevent) ==
|
||||
tep_is_local_bigendian(event->pevent)) {
|
||||
if (tep_is_file_bigendian(event->tep) ==
|
||||
tep_is_local_bigendian(event->tep)) {
|
||||
|
||||
trace_seq_printf(s, "%u q%u%s %s%s %spae %snxe %swp%s%s%s",
|
||||
role.level,
|
||||
|
|
|
@ -62,7 +62,7 @@ static void write_and_save_comm(struct tep_format_field *field,
|
|||
comm = &s->buffer[len];
|
||||
|
||||
/* Help out the comm to ids. This will handle dups */
|
||||
tep_register_comm(field->event->pevent, comm, pid);
|
||||
tep_register_comm(field->event->tep, comm, pid);
|
||||
}
|
||||
|
||||
static int sched_wakeup_handler(struct trace_seq *s,
|
||||
|
|
|
@ -1975,7 +1975,7 @@ int cmd_kmem(int argc, const char **argv)
|
|||
goto out_delete;
|
||||
}
|
||||
|
||||
kmem_page_size = tep_get_page_size(evsel->tp_format->pevent);
|
||||
kmem_page_size = tep_get_page_size(evsel->tp_format->tep);
|
||||
symbol_conf.use_callchain = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -310,7 +310,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
|||
if (flags & TEP_FIELD_IS_DYNAMIC) {
|
||||
unsigned long long tmp_val;
|
||||
|
||||
tmp_val = tep_read_number(fmtf->event->pevent,
|
||||
tmp_val = tep_read_number(fmtf->event->tep,
|
||||
data + offset, len);
|
||||
offset = tmp_val;
|
||||
len = offset >> 16;
|
||||
|
@ -354,7 +354,7 @@ static int add_tracepoint_field_value(struct ctf_writer *cw,
|
|||
unsigned long long value_int;
|
||||
|
||||
value_int = tep_read_number(
|
||||
fmtf->event->pevent,
|
||||
fmtf->event->tep,
|
||||
data + offset + i * len, len);
|
||||
|
||||
if (!(flags & TEP_FIELD_IS_SIGNED))
|
||||
|
|
|
@ -342,7 +342,7 @@ static bool is_tracepoint(struct pyrf_event *pevent)
|
|||
static PyObject*
|
||||
tracepoint_field(struct pyrf_event *pe, struct tep_format_field *field)
|
||||
{
|
||||
struct tep_handle *pevent = field->event->pevent;
|
||||
struct tep_handle *pevent = field->event->tep;
|
||||
void *data = pe->sample.raw_data;
|
||||
PyObject *ret = NULL;
|
||||
unsigned long long val;
|
||||
|
|
|
@ -372,7 +372,7 @@ static void perl_process_tracepoint(struct perf_sample *sample,
|
|||
ns = nsecs - s * NSEC_PER_SEC;
|
||||
|
||||
scripting_context->event_data = data;
|
||||
scripting_context->pevent = evsel->tp_format->pevent;
|
||||
scripting_context->pevent = evsel->tp_format->tep;
|
||||
|
||||
ENTER;
|
||||
SAVETMPS;
|
||||
|
|
|
@ -837,7 +837,7 @@ static void python_process_tracepoint(struct perf_sample *sample,
|
|||
ns = nsecs - s * NSEC_PER_SEC;
|
||||
|
||||
scripting_context->event_data = data;
|
||||
scripting_context->pevent = evsel->tp_format->pevent;
|
||||
scripting_context->pevent = evsel->tp_format->tep;
|
||||
|
||||
context = _PyCapsule_New(scripting_context, NULL, NULL);
|
||||
|
||||
|
|
|
@ -111,7 +111,7 @@ raw_field_value(struct tep_event *event, const char *name, void *data)
|
|||
|
||||
unsigned long long read_size(struct tep_event *event, void *ptr, int size)
|
||||
{
|
||||
return tep_read_number(event->pevent, ptr, size);
|
||||
return tep_read_number(event->tep, ptr, size);
|
||||
}
|
||||
|
||||
void event_format__fprintf(struct tep_event *event,
|
||||
|
|
Загрузка…
Ссылка в новой задаче