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

tools lib traceevent: Rename various pevent 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_reset_function_resolver, pevent_strerror, pevent_list_events,
pevent_event_common_fields, pevent_event_fields, pevent_ref, pevent_unref
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/20180808180703.426198047@goodmis.orgSigned-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 1634e460
...@@ -471,13 +471,13 @@ int tep_set_function_resolver(struct tep_handle *pevent, ...@@ -471,13 +471,13 @@ int tep_set_function_resolver(struct tep_handle *pevent,
} }
/** /**
* pevent_reset_function_resolver - reset alternative function resolver * tep_reset_function_resolver - reset alternative function resolver
* @pevent: handle for the pevent * @pevent: handle for the pevent
* *
* Stop using whatever alternative resolver was set, use the default * Stop using whatever alternative resolver was set, use the default
* one instead. * one instead.
*/ */
void pevent_reset_function_resolver(struct tep_handle *pevent) void tep_reset_function_resolver(struct tep_handle *pevent)
{ {
free(pevent->func_resolver); free(pevent->func_resolver);
pevent->func_resolver = NULL; pevent->func_resolver = NULL;
...@@ -5630,7 +5630,7 @@ static int events_system_cmp(const void *a, const void *b) ...@@ -5630,7 +5630,7 @@ static int events_system_cmp(const void *a, const void *b)
return events_id_cmp(a, b); return events_id_cmp(a, b);
} }
struct event_format **pevent_list_events(struct tep_handle *pevent, enum event_sort_type sort_type) struct event_format **tep_list_events(struct tep_handle *pevent, enum event_sort_type sort_type)
{ {
struct event_format **events; struct event_format **events;
int (*sort)(const void *a, const void *b); int (*sort)(const void *a, const void *b);
...@@ -5709,13 +5709,13 @@ get_event_fields(const char *type, const char *name, ...@@ -5709,13 +5709,13 @@ get_event_fields(const char *type, const char *name,
} }
/** /**
* pevent_event_common_fields - return a list of common fields for an event * tep_event_common_fields - return a list of common fields for an event
* @event: the event to return the common fields of. * @event: the event to return the common fields of.
* *
* Returns an allocated array of fields. The last item in the array is NULL. * Returns an allocated array of fields. The last item in the array is NULL.
* The array must be freed with free(). * The array must be freed with free().
*/ */
struct format_field **pevent_event_common_fields(struct event_format *event) struct format_field **tep_event_common_fields(struct event_format *event)
{ {
return get_event_fields("common", event->name, return get_event_fields("common", event->name,
event->format.nr_common, event->format.nr_common,
...@@ -5723,13 +5723,13 @@ struct format_field **pevent_event_common_fields(struct event_format *event) ...@@ -5723,13 +5723,13 @@ struct format_field **pevent_event_common_fields(struct event_format *event)
} }
/** /**
* pevent_event_fields - return a list of event specific fields for an event * tep_event_fields - return a list of event specific fields for an event
* @event: the event to return the fields of. * @event: the event to return the fields of.
* *
* Returns an allocated array of fields. The last item in the array is NULL. * Returns an allocated array of fields. The last item in the array is NULL.
* The array must be freed with free(). * The array must be freed with free().
*/ */
struct format_field **pevent_event_fields(struct event_format *event) struct format_field **tep_event_fields(struct event_format *event)
{ {
return get_event_fields("event", event->name, return get_event_fields("event", event->name,
event->format.nr_fields, event->format.nr_fields,
...@@ -6221,8 +6221,8 @@ static const char * const pevent_error_str[] = { ...@@ -6221,8 +6221,8 @@ static const char * const pevent_error_str[] = {
}; };
#undef _PE #undef _PE
int pevent_strerror(struct tep_handle *pevent __maybe_unused, int tep_strerror(struct tep_handle *pevent __maybe_unused,
enum tep_errno errnum, char *buf, size_t buflen) enum tep_errno errnum, char *buf, size_t buflen)
{ {
int idx; int idx;
const char *msg; const char *msg;
...@@ -6766,7 +6766,7 @@ struct tep_handle *tep_alloc(void) ...@@ -6766,7 +6766,7 @@ struct tep_handle *tep_alloc(void)
return pevent; return pevent;
} }
void pevent_ref(struct tep_handle *pevent) void tep_ref(struct tep_handle *pevent)
{ {
pevent->ref_count++; pevent->ref_count++;
} }
...@@ -6899,7 +6899,7 @@ void tep_free(struct tep_handle *pevent) ...@@ -6899,7 +6899,7 @@ void tep_free(struct tep_handle *pevent)
free(pevent); free(pevent);
} }
void pevent_unref(struct tep_handle *pevent) void tep_unref(struct tep_handle *pevent)
{ {
tep_free(pevent); tep_free(pevent);
} }
...@@ -617,7 +617,7 @@ enum trace_flag_type { ...@@ -617,7 +617,7 @@ enum trace_flag_type {
int tep_set_function_resolver(struct tep_handle *pevent, int tep_set_function_resolver(struct tep_handle *pevent,
tep_func_resolver_t *func, void *priv); tep_func_resolver_t *func, void *priv);
void pevent_reset_function_resolver(struct tep_handle *pevent); void tep_reset_function_resolver(struct tep_handle *pevent);
int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid); int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid);
int tep_register_trace_clock(struct tep_handle *pevent, const char *trace_clock); int tep_register_trace_clock(struct tep_handle *pevent, const char *trace_clock);
int tep_register_function(struct tep_handle *pevent, char *name, int tep_register_function(struct tep_handle *pevent, char *name,
...@@ -724,12 +724,12 @@ void tep_print_fields(struct trace_seq *s, void *data, ...@@ -724,12 +724,12 @@ void tep_print_fields(struct trace_seq *s, void *data,
int size __maybe_unused, struct event_format *event); int size __maybe_unused, struct event_format *event);
void tep_event_info(struct trace_seq *s, struct event_format *event, void tep_event_info(struct trace_seq *s, struct event_format *event,
struct tep_record *record); struct tep_record *record);
int pevent_strerror(struct tep_handle *pevent, enum tep_errno errnum, int tep_strerror(struct tep_handle *pevent, enum tep_errno errnum,
char *buf, size_t buflen); char *buf, size_t buflen);
struct event_format **pevent_list_events(struct tep_handle *pevent, enum event_sort_type); struct event_format **tep_list_events(struct tep_handle *pevent, enum event_sort_type);
struct format_field **pevent_event_common_fields(struct event_format *event); struct format_field **tep_event_common_fields(struct event_format *event);
struct format_field **pevent_event_fields(struct event_format *event); struct format_field **tep_event_fields(struct event_format *event);
static inline int tep_get_cpus(struct tep_handle *pevent) static inline int tep_get_cpus(struct tep_handle *pevent)
{ {
...@@ -793,8 +793,8 @@ static inline void tep_set_latency_format(struct tep_handle *pevent, int lat) ...@@ -793,8 +793,8 @@ static inline void tep_set_latency_format(struct tep_handle *pevent, int lat)
struct tep_handle *tep_alloc(void); struct tep_handle *tep_alloc(void);
void tep_free(struct tep_handle *pevent); void tep_free(struct tep_handle *pevent);
void pevent_ref(struct tep_handle *pevent); void tep_ref(struct tep_handle *pevent);
void pevent_unref(struct tep_handle *pevent); void tep_unref(struct tep_handle *pevent);
/* access to the internal parser */ /* access to the internal parser */
void tep_buffer_init(const char *buf, unsigned long long size); void tep_buffer_init(const char *buf, unsigned long long size);
......
...@@ -189,7 +189,7 @@ struct event_filter *tep_filter_alloc(struct tep_handle *pevent) ...@@ -189,7 +189,7 @@ struct event_filter *tep_filter_alloc(struct tep_handle *pevent)
memset(filter, 0, sizeof(*filter)); memset(filter, 0, sizeof(*filter));
filter->pevent = pevent; filter->pevent = pevent;
pevent_ref(pevent); tep_ref(pevent);
return filter; return filter;
} }
...@@ -1393,7 +1393,7 @@ int tep_filter_strerror(struct event_filter *filter, enum tep_errno err, ...@@ -1393,7 +1393,7 @@ int tep_filter_strerror(struct event_filter *filter, enum tep_errno err,
return 0; return 0;
} }
return pevent_strerror(filter->pevent, err, buf, buflen); return tep_strerror(filter->pevent, err, buf, buflen);
} }
/** /**
...@@ -1456,7 +1456,7 @@ void tep_filter_reset(struct event_filter *filter) ...@@ -1456,7 +1456,7 @@ void tep_filter_reset(struct event_filter *filter)
void tep_filter_free(struct event_filter *filter) void tep_filter_free(struct event_filter *filter)
{ {
pevent_unref(filter->pevent); tep_unref(filter->pevent);
tep_filter_reset(filter); tep_filter_reset(filter);
......
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