Skip to content

Commit

Permalink
tools lib traceevent, perf tools: Rename pevent parse APIs
Browse files Browse the repository at this point in the history
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_parse_event, pevent_parse_format, pevent_parse_header_page

Signed-off-by: Tzvetomir Stoyanov (VMware) <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Yordan Karadzhov (VMware) <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Steven Rostedt <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
  • Loading branch information
tzstoyanov authored and acmel committed Aug 13, 2018
1 parent af85cd1 commit c60167c
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
22 changes: 11 additions & 11 deletions tools/lib/traceevent/event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -5930,7 +5930,7 @@ static void parse_header_field(const char *field,
}

/**
* pevent_parse_header_page - parse the data stored in the header page
* tep_parse_header_page - parse the data stored in the header page
* @pevent: the handle to the pevent
* @buf: the buffer storing the header page format string
* @size: the size of @buf
Expand All @@ -5941,8 +5941,8 @@ static void parse_header_field(const char *field,
*
* /sys/kernel/debug/tracing/events/header_page
*/
int pevent_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size,
int long_size)
int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size,
int long_size)
{
int ignore;

Expand Down Expand Up @@ -6171,7 +6171,7 @@ __pevent_parse_event(struct tep_handle *pevent,
}

/**
* pevent_parse_format - parse the event format
* tep_parse_format - parse the event format
* @pevent: the handle to the pevent
* @eventp: returned format
* @buf: the buffer storing the event format string
Expand All @@ -6185,16 +6185,16 @@ __pevent_parse_event(struct tep_handle *pevent,
*
* /sys/kernel/debug/tracing/events/.../.../format
*/
enum pevent_errno pevent_parse_format(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf,
unsigned long size, const char *sys)
enum pevent_errno tep_parse_format(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf,
unsigned long size, const char *sys)
{
return __pevent_parse_event(pevent, eventp, buf, size, sys);
}

/**
* pevent_parse_event - parse the event format
* tep_parse_event - parse the event format
* @pevent: the handle to the pevent
* @buf: the buffer storing the event format string
* @size: the size of @buf
Expand All @@ -6207,8 +6207,8 @@ enum pevent_errno pevent_parse_format(struct tep_handle *pevent,
*
* /sys/kernel/debug/tracing/events/.../.../format
*/
enum pevent_errno pevent_parse_event(struct tep_handle *pevent, const char *buf,
unsigned long size, const char *sys)
enum pevent_errno tep_parse_event(struct tep_handle *pevent, const char *buf,
unsigned long size, const char *sys)
{
struct event_format *event = NULL;
return __pevent_parse_event(pevent, &event, buf, size, sys);
Expand Down
18 changes: 9 additions & 9 deletions tools/lib/traceevent/event-parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -639,15 +639,15 @@ void pevent_print_event_data(struct tep_handle *pevent, struct trace_seq *s,
void pevent_print_event(struct tep_handle *pevent, struct trace_seq *s,
struct tep_record *record, bool use_trace_clock);

int pevent_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size,
int long_size);

enum pevent_errno pevent_parse_event(struct tep_handle *pevent, const char *buf,
unsigned long size, const char *sys);
enum pevent_errno pevent_parse_format(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf,
unsigned long size, const char *sys);
int tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size,
int long_size);

enum pevent_errno tep_parse_event(struct tep_handle *pevent, const char *buf,
unsigned long size, const char *sys);
enum pevent_errno tep_parse_format(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf,
unsigned long size, const char *sys);
void pevent_free_format(struct event_format *event);
void pevent_free_format_field(struct format_field *field);

Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/trace-event-parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,13 @@ void parse_saved_cmdline(struct tep_handle *pevent,

int parse_ftrace_file(struct tep_handle *pevent, char *buf, unsigned long size)
{
return pevent_parse_event(pevent, buf, size, "ftrace");
return tep_parse_event(pevent, buf, size, "ftrace");
}

int parse_event_file(struct tep_handle *pevent,
char *buf, unsigned long size, char *sys)
{
return pevent_parse_event(pevent, buf, size, sys);
return tep_parse_event(pevent, buf, size, sys);
}

struct event_format *trace_find_next_event(struct tep_handle *pevent,
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/trace-event-read.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ static int read_header_files(struct tep_handle *pevent)
return -1;
}

if (!pevent_parse_header_page(pevent, header_page, size,
pevent_get_long_size(pevent))) {
if (!tep_parse_header_page(pevent, header_page, size,
pevent_get_long_size(pevent))) {
/*
* The commit field in the page is of type long,
* use that instead, since it represents the kernel.
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/trace-event.c
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ tp_format(const char *sys, const char *name)
if (err)
return ERR_PTR(err);

pevent_parse_format(pevent, &event, data, size, sys);
tep_parse_format(pevent, &event, data, size, sys);

free(data);
return event;
Expand Down

0 comments on commit c60167c

Please sign in to comment.