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

tools lib traceevent: Rename pevent_data_ 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_data_lat_fmt, pevent_data_type, pevent_data_event_from_type,
pevent_data_pid, pevent_data_preempt_count, pevent_data_flags,
pevent_data_comm_from_pid, pevent_data_pid_from_comm, pevent_cmdline_pid
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.678020020@goodmis.orgSigned-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b843e9c3
...@@ -5140,7 +5140,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event ...@@ -5140,7 +5140,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
} }
/** /**
* pevent_data_lat_fmt - parse the data for the latency format * tep_data_lat_fmt - parse the data for the latency format
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @s: the trace_seq to write to * @s: the trace_seq to write to
* @record: the record to read from * @record: the record to read from
...@@ -5149,7 +5149,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event ...@@ -5149,7 +5149,7 @@ static void pretty_print(struct trace_seq *s, void *data, int size, struct event
* need rescheduling, in hard/soft interrupt, preempt count * need rescheduling, in hard/soft interrupt, preempt count
* and lock depth) and places it into the trace_seq. * and lock depth) and places it into the trace_seq.
*/ */
void pevent_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)
{ {
static int check_lock_depth = 1; static int check_lock_depth = 1;
...@@ -5223,55 +5223,55 @@ void pevent_data_lat_fmt(struct tep_handle *pevent, ...@@ -5223,55 +5223,55 @@ void pevent_data_lat_fmt(struct tep_handle *pevent,
} }
/** /**
* pevent_data_type - parse out the given event type * tep_data_type - parse out the given event type
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @rec: the record to read from * @rec: the record to read from
* *
* This returns the event id from the @rec. * This returns the event id from the @rec.
*/ */
int pevent_data_type(struct tep_handle *pevent, struct tep_record *rec) int tep_data_type(struct tep_handle *pevent, struct tep_record *rec)
{ {
return trace_parse_common_type(pevent, rec->data); return trace_parse_common_type(pevent, rec->data);
} }
/** /**
* pevent_data_event_from_type - find the event by a given type * tep_data_event_from_type - find the event by a given type
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @type: the type of the event. * @type: the type of the event.
* *
* This returns the event form a given @type; * This returns the event form a given @type;
*/ */
struct event_format *pevent_data_event_from_type(struct tep_handle *pevent, int type) struct event_format *tep_data_event_from_type(struct tep_handle *pevent, int type)
{ {
return tep_find_event(pevent, type); return tep_find_event(pevent, type);
} }
/** /**
* pevent_data_pid - parse the PID from record * tep_data_pid - parse the PID from record
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @rec: the record to parse * @rec: the record to parse
* *
* This returns the PID from a record. * This returns the PID from a record.
*/ */
int pevent_data_pid(struct tep_handle *pevent, struct tep_record *rec) int tep_data_pid(struct tep_handle *pevent, struct tep_record *rec)
{ {
return parse_common_pid(pevent, rec->data); return parse_common_pid(pevent, rec->data);
} }
/** /**
* pevent_data_preempt_count - parse the preempt count from the record * tep_data_preempt_count - parse the preempt count from the record
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @rec: the record to parse * @rec: the record to parse
* *
* This returns the preempt count from a record. * This returns the preempt count from a record.
*/ */
int pevent_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec) int tep_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec)
{ {
return parse_common_pc(pevent, rec->data); return parse_common_pc(pevent, rec->data);
} }
/** /**
* pevent_data_flags - parse the latency flags from the record * tep_data_flags - parse the latency flags from the record
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @rec: the record to parse * @rec: the record to parse
* *
...@@ -5279,20 +5279,20 @@ int pevent_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec) ...@@ -5279,20 +5279,20 @@ int pevent_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec)
* *
* Use trace_flag_type enum for the flags (see event-parse.h). * Use trace_flag_type enum for the flags (see event-parse.h).
*/ */
int pevent_data_flags(struct tep_handle *pevent, struct tep_record *rec) int tep_data_flags(struct tep_handle *pevent, struct tep_record *rec)
{ {
return parse_common_flags(pevent, rec->data); return parse_common_flags(pevent, rec->data);
} }
/** /**
* pevent_data_comm_from_pid - return the command line from PID * tep_data_comm_from_pid - return the command line from PID
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @pid: the PID of the task to search for * @pid: the PID of the task to search for
* *
* This returns a pointer to the command line that has the given * This returns a pointer to the command line that has the given
* @pid. * @pid.
*/ */
const char *pevent_data_comm_from_pid(struct tep_handle *pevent, int pid) const char *tep_data_comm_from_pid(struct tep_handle *pevent, int pid)
{ {
const char *comm; const char *comm;
...@@ -5317,7 +5317,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct cmdline *ne ...@@ -5317,7 +5317,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct cmdline *ne
} }
/** /**
* pevent_data_pid_from_comm - return the pid from a given comm * tep_data_pid_from_comm - return the pid from a given comm
* @pevent: a handle to the pevent * @pevent: a handle to the pevent
* @comm: the cmdline to find the pid from * @comm: the cmdline to find the pid from
* @next: the cmdline structure to find the next comm * @next: the cmdline structure to find the next comm
...@@ -5329,7 +5329,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct cmdline *ne ...@@ -5329,7 +5329,7 @@ pid_from_cmdlist(struct tep_handle *pevent, const char *comm, struct cmdline *ne
* next pid. * next pid.
* Also, it does a linear seach, so it may be slow. * Also, it does a linear seach, so it may be slow.
*/ */
struct cmdline *pevent_data_pid_from_comm(struct tep_handle *pevent, const char *comm, struct cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char *comm,
struct cmdline *next) struct cmdline *next)
{ {
struct cmdline *cmdline; struct cmdline *cmdline;
...@@ -5365,13 +5365,13 @@ struct cmdline *pevent_data_pid_from_comm(struct tep_handle *pevent, const char ...@@ -5365,13 +5365,13 @@ struct cmdline *pevent_data_pid_from_comm(struct tep_handle *pevent, const char
} }
/** /**
* pevent_cmdline_pid - return the pid associated to a given cmdline * tep_cmdline_pid - return the pid associated to a given cmdline
* @cmdline: The cmdline structure to get the pid from * @cmdline: The cmdline structure to get the pid from
* *
* Returns the pid for a give cmdline. If @cmdline is NULL, then * Returns the pid for a give cmdline. If @cmdline is NULL, then
* -1 is returned. * -1 is returned.
*/ */
int pevent_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline) int tep_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline)
{ {
struct cmdline_list *cmdlist = (struct cmdline_list *)cmdline; struct cmdline_list *cmdlist = (struct cmdline_list *)cmdline;
...@@ -5391,7 +5391,7 @@ int pevent_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline) ...@@ -5391,7 +5391,7 @@ int pevent_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline)
} }
/** /**
* pevent_data_comm_from_pid - parse the data into the print format * tep_event_info - parse the data into the print format
* @s: the trace_seq to write to * @s: the trace_seq to write to
* @event: the handle to the event * @event: the handle to the event
* @record: the record to read from * @record: the record to read from
...@@ -5511,7 +5511,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s, ...@@ -5511,7 +5511,7 @@ void tep_print_event_time(struct tep_handle *pevent, struct trace_seq *s,
} }
if (pevent->latency_format) { if (pevent->latency_format) {
pevent_data_lat_fmt(pevent, s, record); tep_data_lat_fmt(pevent, s, record);
} }
if (use_usec_format) { if (use_usec_format) {
......
...@@ -705,18 +705,18 @@ pevent_find_event_by_name(struct tep_handle *pevent, const char *sys, const char ...@@ -705,18 +705,18 @@ pevent_find_event_by_name(struct tep_handle *pevent, const char *sys, const char
struct event_format * struct event_format *
pevent_find_event_by_record(struct tep_handle *pevent, struct tep_record *record); pevent_find_event_by_record(struct tep_handle *pevent, struct tep_record *record);
void pevent_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);
int pevent_data_type(struct tep_handle *pevent, struct tep_record *rec); int tep_data_type(struct tep_handle *pevent, struct tep_record *rec);
struct event_format *pevent_data_event_from_type(struct tep_handle *pevent, int type); struct event_format *tep_data_event_from_type(struct tep_handle *pevent, int type);
int pevent_data_pid(struct tep_handle *pevent, struct tep_record *rec); int tep_data_pid(struct tep_handle *pevent, struct tep_record *rec);
int pevent_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec); int tep_data_preempt_count(struct tep_handle *pevent, struct tep_record *rec);
int pevent_data_flags(struct tep_handle *pevent, struct tep_record *rec); int tep_data_flags(struct tep_handle *pevent, struct tep_record *rec);
const char *pevent_data_comm_from_pid(struct tep_handle *pevent, int pid); const char *tep_data_comm_from_pid(struct tep_handle *pevent, int pid);
struct cmdline; struct cmdline;
struct cmdline *pevent_data_pid_from_comm(struct tep_handle *pevent, const char *comm, struct cmdline *tep_data_pid_from_comm(struct tep_handle *pevent, const char *comm,
struct cmdline *next); struct cmdline *next);
int pevent_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline); int tep_cmdline_pid(struct tep_handle *pevent, struct cmdline *cmdline);
void tep_print_field(struct trace_seq *s, void *data, void tep_print_field(struct trace_seq *s, void *data,
struct format_field *field); struct format_field *field);
......
...@@ -1705,8 +1705,8 @@ get_comm(struct event_format *event, struct tep_record *record) ...@@ -1705,8 +1705,8 @@ get_comm(struct event_format *event, struct tep_record *record)
const char *comm; const char *comm;
int pid; int pid;
pid = pevent_data_pid(event->pevent, record); pid = tep_data_pid(event->pevent, record);
comm = pevent_data_comm_from_pid(event->pevent, pid); comm = tep_data_comm_from_pid(event->pevent, pid);
return comm; return comm;
} }
...@@ -2060,7 +2060,7 @@ enum tep_errno tep_filter_match(struct event_filter *filter, ...@@ -2060,7 +2060,7 @@ enum tep_errno tep_filter_match(struct event_filter *filter,
if (!filter->filters) if (!filter->filters)
return TEP_ERRNO__NO_FILTER; return TEP_ERRNO__NO_FILTER;
event_id = pevent_data_type(pevent, record); event_id = tep_data_type(pevent, record);
filter_type = find_filter_type(filter, event_id); filter_type = find_filter_type(filter, event_id);
if (!filter_type) if (!filter_type)
......
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