Commit 610e1e4f authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo

tools lib traceevent: Rename pevent_find_* APIs

In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_" and not "pevent_". This changes
APIs: pevent_find_function, pevent_find_function_address,
pevent_find_event_by_name, pevent_find_event_by_record
Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180808180702.966965051@goodmis.orgSigned-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8b3e0872
...@@ -503,7 +503,7 @@ find_func(struct tep_handle *pevent, unsigned long long addr) ...@@ -503,7 +503,7 @@ find_func(struct tep_handle *pevent, unsigned long long addr)
} }
/** /**
* pevent_find_function - find a function by a given address * tep_find_function - find a function by a given address
* @pevent: handle for the pevent * @pevent: handle for the pevent
* @addr: the address to find the function with * @addr: the address to find the function with
* *
...@@ -511,7 +511,7 @@ find_func(struct tep_handle *pevent, unsigned long long addr) ...@@ -511,7 +511,7 @@ find_func(struct tep_handle *pevent, unsigned long long addr)
* address. Note, the address does not have to be exact, it * address. Note, the address does not have to be exact, it
* will select the function that would contain the address. * will select the function that would contain the address.
*/ */
const char *pevent_find_function(struct tep_handle *pevent, unsigned long long addr) const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr)
{ {
struct func_map *map; struct func_map *map;
...@@ -523,16 +523,16 @@ const char *pevent_find_function(struct tep_handle *pevent, unsigned long long a ...@@ -523,16 +523,16 @@ const char *pevent_find_function(struct tep_handle *pevent, unsigned long long a
} }
/** /**
* pevent_find_function_address - find a function address by a given address * tep_find_function_address - find a function address by a given address
* @pevent: handle for the pevent * @pevent: handle for the pevent
* @addr: the address to find the function with * @addr: the address to find the function with
* *
* Returns the address the function starts at. This can be used in * Returns the address the function starts at. This can be used in
* conjunction with pevent_find_function to print both the function * conjunction with tep_find_function to print both the function
* name and the function offset. * name and the function offset.
*/ */
unsigned long long unsigned long long
pevent_find_function_address(struct tep_handle *pevent, unsigned long long addr) tep_find_function_address(struct tep_handle *pevent, unsigned long long addr)
{ {
struct func_map *map; struct func_map *map;
...@@ -3498,7 +3498,7 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id) ...@@ -3498,7 +3498,7 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id)
} }
/** /**
* pevent_find_event_by_name - find an event by given name * tep_find_event_by_name - find an event by given name
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @sys: the system name to search for * @sys: the system name to search for
* @name: the name of the event to search for * @name: the name of the event to search for
...@@ -3507,8 +3507,8 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id) ...@@ -3507,8 +3507,8 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id)
* @sys. If @sys is NULL the first event with @name is returned. * @sys. If @sys is NULL the first event with @name is returned.
*/ */
struct event_format * struct event_format *
pevent_find_event_by_name(struct tep_handle *pevent, tep_find_event_by_name(struct tep_handle *pevent,
const char *sys, const char *name) const char *sys, const char *name)
{ {
struct event_format *event; struct event_format *event;
int i; int i;
...@@ -5433,7 +5433,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock) ...@@ -5433,7 +5433,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
} }
/** /**
* pevent_find_event_by_record - return the event from a given record * tep_find_event_by_record - return the event from a given record
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @record: The record to get the event from * @record: The record to get the event from
* *
...@@ -5441,7 +5441,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock) ...@@ -5441,7 +5441,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
* is found. * is found.
*/ */
struct event_format * struct event_format *
pevent_find_event_by_record(struct tep_handle *pevent, struct tep_record *record) tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record)
{ {
int type; int type;
...@@ -5564,7 +5564,7 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5564,7 +5564,7 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s,
{ {
struct event_format *event; struct event_format *event;
event = pevent_find_event_by_record(pevent, record); event = tep_find_event_by_record(pevent, record);
if (!event) { if (!event) {
int i; int i;
int type = trace_parse_common_type(pevent, record->data); int type = trace_parse_common_type(pevent, record->data);
...@@ -6607,7 +6607,7 @@ static struct event_format *pevent_search_event(struct tep_handle *pevent, int i ...@@ -6607,7 +6607,7 @@ static struct event_format *pevent_search_event(struct tep_handle *pevent, int i
if (sys_name && (strcmp(sys_name, event->system) != 0)) if (sys_name && (strcmp(sys_name, event->system) != 0))
return NULL; return NULL;
} else { } else {
event = pevent_find_event_by_name(pevent, sys_name, event_name); event = tep_find_event_by_name(pevent, sys_name, event_name);
if (!event) if (!event)
return NULL; return NULL;
} }
......
...@@ -690,9 +690,9 @@ struct format_field *tep_find_common_field(struct event_format *event, const cha ...@@ -690,9 +690,9 @@ struct format_field *tep_find_common_field(struct event_format *event, const cha
struct format_field *tep_find_field(struct event_format *event, const char *name); struct format_field *tep_find_field(struct event_format *event, const char *name);
struct format_field *tep_find_any_field(struct event_format *event, const char *name); struct format_field *tep_find_any_field(struct event_format *event, const char *name);
const char *pevent_find_function(struct tep_handle *pevent, unsigned long long addr); const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr);
unsigned long long unsigned long long
pevent_find_function_address(struct tep_handle *pevent, unsigned long long addr); tep_find_function_address(struct tep_handle *pevent, unsigned long long addr);
unsigned long long tep_read_number(struct tep_handle *pevent, const void *ptr, int size); unsigned long long tep_read_number(struct tep_handle *pevent, const void *ptr, int size);
int tep_read_number_field(struct format_field *field, const void *data, int tep_read_number_field(struct format_field *field, const void *data,
unsigned long long *value); unsigned long long *value);
...@@ -700,10 +700,10 @@ int tep_read_number_field(struct format_field *field, const void *data, ...@@ -700,10 +700,10 @@ int tep_read_number_field(struct format_field *field, const void *data,
struct event_format *tep_find_event(struct tep_handle *pevent, int id); struct event_format *tep_find_event(struct tep_handle *pevent, int id);
struct event_format * struct event_format *
pevent_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *name); tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *name);
struct event_format * struct event_format *
pevent_find_event_by_record(struct tep_handle *pevent, struct tep_record *record); tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record);
void tep_data_lat_fmt(struct tep_handle *pevent, void tep_data_lat_fmt(struct tep_handle *pevent,
struct trace_seq *s, struct tep_record *record); struct trace_seq *s, struct tep_record *record);
......
...@@ -1478,7 +1478,7 @@ static int copy_filter_type(struct event_filter *filter, ...@@ -1478,7 +1478,7 @@ static int copy_filter_type(struct event_filter *filter,
/* Can't assume that the pevent's are the same */ /* Can't assume that the pevent's are the same */
sys = filter_type->event->system; sys = filter_type->event->system;
name = filter_type->event->name; name = filter_type->event->name;
event = pevent_find_event_by_name(filter->pevent, sys, name); event = tep_find_event_by_name(filter->pevent, sys, name);
if (!event) if (!event)
return -1; return -1;
...@@ -1578,9 +1578,9 @@ int tep_update_trivial(struct event_filter *dest, struct event_filter *source, ...@@ -1578,9 +1578,9 @@ int tep_update_trivial(struct event_filter *dest, struct event_filter *source,
if (src_pevent != dest_pevent) { if (src_pevent != dest_pevent) {
/* do a look up */ /* do a look up */
event = pevent_find_event_by_name(src_pevent, event = tep_find_event_by_name(src_pevent,
event->system, event->system,
event->name); event->name);
if (!event) if (!event)
return -1; return -1;
} }
...@@ -1909,7 +1909,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco ...@@ -1909,7 +1909,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco
if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG)) if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG))
/* convert to a kernel symbol */ /* convert to a kernel symbol */
val = pevent_find_function(pevent, addr); val = tep_find_function(pevent, addr);
if (val == NULL) { if (val == NULL) {
/* just use the hex of the string name */ /* just use the hex of the string name */
......
...@@ -135,12 +135,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record, ...@@ -135,12 +135,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,
if (tep_get_field_val(s, event, "ip", record, &function, 1)) if (tep_get_field_val(s, event, "ip", record, &function, 1))
return trace_seq_putc(s, '!'); return trace_seq_putc(s, '!');
func = pevent_find_function(pevent, function); func = tep_find_function(pevent, function);
if (tep_get_field_val(s, event, "parent_ip", record, &pfunction, 1)) if (tep_get_field_val(s, event, "parent_ip", record, &pfunction, 1))
return trace_seq_putc(s, '!'); return trace_seq_putc(s, '!');
parent = pevent_find_function(pevent, pfunction); parent = tep_find_function(pevent, pfunction);
if (parent && ftrace_indent->set) if (parent && ftrace_indent->set)
index = add_and_get_index(parent, func, record->cpu); index = add_and_get_index(parent, func, record->cpu);
......
...@@ -38,11 +38,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record, ...@@ -38,11 +38,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,
if (tep_read_number_field(field, data, &val)) if (tep_read_number_field(field, data, &val))
return 1; return 1;
func = pevent_find_function(event->pevent, val); func = tep_find_function(event->pevent, val);
if (!func) if (!func)
return 1; return 1;
addr = pevent_find_function_address(event->pevent, val); addr = tep_find_function_address(event->pevent, val);
trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr)); trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr));
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment