From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org,
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
Subject: [PATCH 24/24] tools/lib/traceevent: Rename static variables and functions in event-parse.c
Date: Wed, 1 Aug 2018 15:41:56 +0300 [thread overview]
Message-ID: <20180801124156.20894-25-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20180801124156.20894-1-tz.stoyanov@gmail.com>
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
static variables and functions in event-parse.c: pevent_func_params,
__pevent_parse_format, __pevent_parse_event, pevent_error_str, pevent_search_event
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
tools/lib/traceevent/event-parse.c | 38 +++++++++++++++---------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 58529f6e02b2..47c7e4efd867 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -92,8 +92,8 @@ struct event_handler {
void *context;
};
-struct pevent_func_params {
- struct pevent_func_params *next;
+struct func_params {
+ struct func_params *next;
enum tep_func_arg_type type;
};
@@ -102,7 +102,7 @@ struct tep_function_handler {
enum tep_func_arg_type ret_type;
char *name;
tep_func_handler func;
- struct pevent_func_params *params;
+ struct func_params *params;
int nr_args;
};
@@ -1161,7 +1161,7 @@ static enum event_type read_token(char **tok)
* @tok: The token to return
*
* This will parse tokens from the string given by
- * pevent_init_data().
+ * tep_init_data().
*
* Returns the token type.
*/
@@ -4133,7 +4133,7 @@ process_defined_func(struct trace_seq *s, void *data, int size,
struct event_format *event, struct print_arg *arg)
{
struct tep_function_handler *func_handle = arg->func.func;
- struct pevent_func_params *param;
+ struct func_params *param;
unsigned long long *args;
unsigned long long ret;
struct print_arg *farg;
@@ -6023,7 +6023,7 @@ static int find_event_handle(struct tep_handle *pevent, struct event_format *eve
}
/**
- * __pevent_parse_format - parse the event format
+ * __tep_parse_format - parse the event format
* @buf: the buffer storing the event format string
* @size: the size of @buf
* @sys: the system the event belongs to
@@ -6035,7 +6035,7 @@ static int find_event_handle(struct tep_handle *pevent, struct event_format *eve
*
* /sys/kernel/debug/tracing/events/.../.../format
*/
-enum tep_errno __pevent_parse_format(struct event_format **eventp,
+enum tep_errno __tep_parse_format(struct event_format **eventp,
struct tep_handle *pevent, const char *buf,
unsigned long size, const char *sys)
{
@@ -6143,12 +6143,12 @@ enum tep_errno __pevent_parse_format(struct event_format **eventp,
}
static enum tep_errno
-__pevent_parse_event(struct tep_handle *pevent,
+__parse_event(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf, unsigned long size,
const char *sys)
{
- int ret = __pevent_parse_format(eventp, pevent, buf, size, sys);
+ int ret = __tep_parse_format(eventp, pevent, buf, size, sys);
struct event_format *event = *eventp;
if (event == NULL)
@@ -6190,7 +6190,7 @@ enum tep_errno tep_parse_format(struct tep_handle *pevent,
const char *buf,
unsigned long size, const char *sys)
{
- return __pevent_parse_event(pevent, eventp, buf, size, sys);
+ return __parse_event(pevent, eventp, buf, size, sys);
}
/**
@@ -6211,12 +6211,12 @@ enum tep_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);
+ return __parse_event(pevent, &event, buf, size, sys);
}
#undef _PE
#define _PE(code, str) str
-static const char * const pevent_error_str[] = {
+static const char * const tep_error_str[] = {
TEP_ERRORS
};
#undef _PE
@@ -6237,7 +6237,7 @@ int tep_strerror(struct tep_handle *pevent __maybe_unused,
return -1;
idx = errnum - __TEP_ERRNO__START - 1;
- msg = pevent_error_str[idx];
+ msg = tep_error_str[idx];
snprintf(buf, buflen, "%s", msg);
return 0;
@@ -6463,7 +6463,7 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt,
static void free_func_handle(struct tep_function_handler *func)
{
- struct pevent_func_params *params;
+ struct func_params *params;
free(func->name);
@@ -6497,8 +6497,8 @@ int tep_register_print_function(struct tep_handle *pevent,
char *name, ...)
{
struct tep_function_handler *func_handle;
- struct pevent_func_params **next_param;
- struct pevent_func_params *param;
+ struct func_params **next_param;
+ struct func_params *param;
enum tep_func_arg_type type;
va_list ap;
int ret;
@@ -6591,7 +6591,7 @@ int tep_unregister_print_function(struct tep_handle *pevent,
return -1;
}
-static struct event_format *pevent_search_event(struct tep_handle *pevent, int id,
+static struct event_format *search_event(struct tep_handle *pevent, int id,
const char *sys_name,
const char *event_name)
{
@@ -6638,7 +6638,7 @@ int tep_register_event_handler(struct tep_handle *pevent, int id,
struct event_format *event;
struct event_handler *handle;
- event = pevent_search_event(pevent, id, sys_name, event_name);
+ event = search_event(pevent, id, sys_name, event_name);
if (event == NULL)
goto not_found;
@@ -6723,7 +6723,7 @@ int tep_unregister_event_handler(struct tep_handle *pevent, int id,
struct event_handler *handle;
struct event_handler **next;
- event = pevent_search_event(pevent, id, sys_name, event_name);
+ event = search_event(pevent, id, sys_name, event_name);
if (event == NULL)
goto not_found;
--
2.17.1
next prev parent reply other threads:[~2018-08-01 14:28 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 12:41 [PATCH 00/24] Rename variables, data structures and functions in libtraceevent Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 01/24] tools/lib/traceevent, tools/perf: Rename struct pevent Tzvetomir Stoyanov (VMware)
2018-08-01 19:19 ` Steven Rostedt
2018-08-01 12:41 ` [PATCH 02/24] tools/lib/traceevent, tools/perf: Rename struct pevent_record Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 03/24] tools/lib/traceevent, tools/perf: Rename pevent plugin related APIs Tzvetomir Stoyanov (VMware)
2018-08-01 19:22 ` Steven Rostedt
2018-08-01 12:41 ` [PATCH 04/24] tools/lib/traceevent, tools/perf: Rename pevent alloc / free APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 05/24] tools/lib/traceevent, tools/perf: Rename pevent find APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 06/24] tools/lib/traceevent, tools/perf: Rename pevent parse APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 07/24] tools/lib/traceevent, tools/perf: Rename pevent print APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 08/24] tools/lib/traceevent, tools/perf: Rename pevent_read_number_* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 09/24] tools/lib/traceevent, tools/perf: Rename pevent_register_* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 10/24] tools/lib/traceevent, tools/perf: Rename pevent_set_* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 11/24] tools/lib/traceevent, tools/perf: Rename traceevent_* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 12/24] tools/lib/traceevent, tools/perf: Rename enum pevent_flag Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 13/24] tools/lib/traceevent, tools/lib/lockdep/: Rename enunm pevent_errno Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 14/24] tools/lib/traceevent: Rename pevent_function* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 15/24] tools/lib/traceevent, tools/perf: Rename traceevent_* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 16/24] tools/lib/traceevent: Rename pevent_filter* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 17/24] tools/lib/traceevent: Rename pevent_register / unregister APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 18/24] tools/lib/traceevent: Rename pevent_data_ APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 19/24] tools/lib/traceevent: Rename pevent filed APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 20/24] tools/lib/traceevent: Rename pevent_find_* APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 21/24] tools/lib/traceevent: Rename various pevent get/set/is APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 22/24] tools/lib/traceevent: Rename internal parser related APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` [PATCH 23/24] tools/lib/traceevent: Rename various pevent APIs Tzvetomir Stoyanov (VMware)
2018-08-01 12:41 ` Tzvetomir Stoyanov (VMware) [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-08-02 14:02 [PATCH 00/24] Rename variables, data structures and functions in libtraceevent Tzvetomir Stoyanov (VMware)
2018-08-02 14:02 ` [PATCH 24/24] tools/lib/traceevent: Rename static variables and functions in event-parse.c Tzvetomir Stoyanov (VMware)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180801124156.20894-25-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).