From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org, linux-trace-devel@vger.kernel.org
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
"Yordan Karadzhov (VMware)" <y.karadz@gmail.com>,
"Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
Subject: [RFC][PATCH v2 24/24] tools/lib/traceevent: Rename static variables and functions in event-parse.c
Date: Wed, 08 Aug 2018 14:03:09 -0400 [thread overview]
Message-ID: <20180808180703.575392642@goodmis.org> (raw)
In-Reply-To: 20180808180245.352784763@goodmis.org
From: "Tzvetomir Stoyanov (VMware)" <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>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/lib/traceevent/event-parse.c | 54 +++++++++++++++---------------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index f723c088acca..6313e32680ff 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -92,9 +92,9 @@ struct event_handler {
void *context;
};
-struct pevent_func_params {
- struct pevent_func_params *next;
- enum tep_func_arg_type type;
+struct func_params {
+ struct func_params *next;
+ enum tep_func_arg_type type;
};
struct tep_function_handler {
@@ -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,9 +6035,9 @@ 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,
- struct tep_handle *pevent, const char *buf,
- unsigned long size, const char *sys)
+enum tep_errno __tep_parse_format(struct event_format **eventp,
+ struct tep_handle *pevent, const char *buf,
+ unsigned long size, const char *sys)
{
struct event_format *event;
int ret;
@@ -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,
- struct event_format **eventp,
- const char *buf, unsigned long size,
- const char *sys)
+__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,9 +6591,9 @@ int tep_unregister_print_function(struct tep_handle *pevent,
return -1;
}
-static struct event_format *pevent_search_event(struct tep_handle *pevent, int id,
- const char *sys_name,
- const char *event_name)
+static struct event_format *search_event(struct tep_handle *pevent, int id,
+ const char *sys_name,
+ const char *event_name)
{
struct event_format *event;
@@ -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.18.0
next prev parent reply other threads:[~2018-08-08 18:07 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 18:02 [RFC][PATCH v2 00/24] tools lib traceevent: Rename pevent to tep for preparation for library Steven Rostedt
2018-08-08 18:02 ` [RFC][PATCH v2 01/24] tools/lib/traceevent, tools/perf: Rename struct pevent to struct tep_handle Steven Rostedt
2018-08-18 11:43 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 02/24] tools/lib/traceevent, tools/perf: Rename struct pevent_record to struct tep_record Steven Rostedt
2018-08-18 11:44 ` [tip:perf/urgent] tools lib traceevent, perf tools: Rename 'struct pevent_record' to 'struct tep_record' tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 03/24] tools/lib/traceevent, tools/perf: Rename pevent plugin related APIs Steven Rostedt
2018-08-18 11:44 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 04/24] tools/lib/traceevent, tools/perf: Rename pevent alloc / free APIs Steven Rostedt
2018-08-18 11:45 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 05/24] tools/lib/traceevent, tools/perf: Rename pevent find APIs Steven Rostedt
2018-08-18 11:45 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 06/24] tools/lib/traceevent, tools/perf: Rename pevent parse APIs Steven Rostedt
2018-08-18 11:46 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 07/24] tools/lib/traceevent, tools/perf: Rename pevent print APIs Steven Rostedt
2018-08-18 11:46 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 08/24] tools/lib/traceevent, tools/perf: Rename pevent_read_number_* APIs Steven Rostedt
2018-08-18 11:47 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 09/24] tools/lib/traceevent, tools/perf: Rename pevent_register_* APIs Steven Rostedt
2018-08-18 11:47 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 10/24] tools/lib/traceevent, tools/perf: Rename pevent_set_* APIs Steven Rostedt
2018-08-18 11:48 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 11/24] tools/lib/traceevent, tools/perf: Rename traceevent_* APIs Steven Rostedt
2018-08-18 11:48 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 12/24] tools/lib/traceevent, tools/perf: Rename enum pevent_flag to enum tep_flag Steven Rostedt
2018-08-18 11:49 ` [tip:perf/urgent] tools lib traceevent, perf tools: Rename 'enum pevent_flag' to 'enum tep_flag' tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 13/24] tools/lib/traceevent, tools/lib/lockdep/: Rename enunm pevent_errno to enum tep_errno Steven Rostedt
2018-08-18 11:49 ` [tip:perf/urgent] tools lib traceevent, tools lib lockdep: Rename 'enum pevent_errno' to 'enum tep_errno' tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:02 ` [RFC][PATCH v2 14/24] tools/lib/traceevent: Rename pevent_function* APIs Steven Rostedt
2018-08-18 11:50 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 15/24] tools/lib/traceevent, tools/perf: Rename traceevent_plugin_* APIs Steven Rostedt
2018-08-18 11:50 ` [tip:perf/urgent] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 16/24] tools/lib/traceevent: Rename pevent_filter* APIs Steven Rostedt
2018-08-18 11:51 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 17/24] tools/lib/traceevent: Rename pevent_register / unregister APIs Steven Rostedt
2018-08-18 11:51 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 18/24] tools/lib/traceevent: Rename pevent_data_ APIs Steven Rostedt
2018-08-18 11:52 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 19/24] tools/lib/traceevent: Rename pevent field APIs Steven Rostedt
2018-08-18 11:52 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 20/24] tools/lib/traceevent: Rename pevent_find_* APIs Steven Rostedt
2018-08-18 11:53 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 21/24] tools/lib/traceevent: Rename various pevent get/set/is APIs Steven Rostedt
2018-08-18 11:53 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-22 14:36 ` Steven Rostedt
2018-08-23 13:59 ` Arnaldo Carvalho de Melo
2018-08-08 18:03 ` [RFC][PATCH v2 22/24] tools/lib/traceevent: Rename internal parser related APIs Steven Rostedt
2018-08-18 11:54 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` [RFC][PATCH v2 23/24] tools/lib/traceevent: Rename various pevent APIs Steven Rostedt
2018-08-18 11:54 ` [tip:perf/urgent] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-08-08 18:03 ` Steven Rostedt [this message]
2018-08-18 11:55 ` [tip:perf/urgent] tools lib traceevent: Rename static variables and functions in event-parse.c tip-bot for 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=20180808180703.575392642@goodmis.org \
--to=rostedt@goodmis.org \
--cc=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tz.stoyanov@gmail.com \
--cc=y.karadz@gmail.com \
/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).