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 22/24] tools/lib/traceevent: Rename internal parser related APIs
Date: Wed, 08 Aug 2018 14:03:07 -0400 [thread overview]
Message-ID: <20180808180703.275281085@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
APIs: pevent_buffer_init, pevent_read_token, pevent_free_token,
pevent_peek_char, pevent_get_input_buf, pevent_get_input_buf_ptr
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 | 24 ++++++++++++------------
tools/lib/traceevent/event-parse.h | 12 ++++++------
tools/lib/traceevent/parse-filter.c | 16 ++++++++--------
3 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index d367f7f2f2fc..8215e6ff36eb 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -73,12 +73,12 @@ static void init_input_buf(const char *buf, unsigned long long size)
input_buf_ptr = 0;
}
-const char *pevent_get_input_buf(void)
+const char *tep_get_input_buf(void)
{
return input_buf;
}
-unsigned long long pevent_get_input_buf_ptr(void)
+unsigned long long tep_get_input_buf_ptr(void)
{
return input_buf_ptr;
}
@@ -113,14 +113,14 @@ process_defined_func(struct trace_seq *s, void *data, int size,
static void free_func_handle(struct tep_function_handler *func);
/**
- * pevent_buffer_init - init buffer for parsing
+ * tep_buffer_init - init buffer for parsing
* @buf: buffer to parse
* @size: the size of the buffer
*
- * For use with pevent_read_token(), this initializes the internal
- * buffer that pevent_read_token() will parse.
+ * For use with tep_read_token(), this initializes the internal
+ * buffer that tep_read_token() will parse.
*/
-void pevent_buffer_init(const char *buf, unsigned long long size)
+void tep_buffer_init(const char *buf, unsigned long long size)
{
init_input_buf(buf, size);
}
@@ -913,11 +913,11 @@ static int __peek_char(void)
}
/**
- * pevent_peek_char - peek at the next character that will be read
+ * tep_peek_char - peek at the next character that will be read
*
* Returns the next character read, or -1 if end of buffer.
*/
-int pevent_peek_char(void)
+int tep_peek_char(void)
{
return __peek_char();
}
@@ -1157,7 +1157,7 @@ static enum event_type read_token(char **tok)
}
/**
- * pevent_read_token - access to utilites to use the pevent parser
+ * tep_read_token - access to utilites to use the pevent parser
* @tok: The token to return
*
* This will parse tokens from the string given by
@@ -1165,16 +1165,16 @@ static enum event_type read_token(char **tok)
*
* Returns the token type.
*/
-enum event_type pevent_read_token(char **tok)
+enum event_type tep_read_token(char **tok)
{
return read_token(tok);
}
/**
- * pevent_free_token - free a token returned by pevent_read_token
+ * tep_free_token - free a token returned by tep_read_token
* @token: the token to free
*/
-void pevent_free_token(char *token)
+void tep_free_token(char *token)
{
free_token(token);
}
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 7f8921431cf1..c41547353b4c 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -797,12 +797,12 @@ void pevent_ref(struct tep_handle *pevent);
void pevent_unref(struct tep_handle *pevent);
/* access to the internal parser */
-void pevent_buffer_init(const char *buf, unsigned long long size);
-enum event_type pevent_read_token(char **tok);
-void pevent_free_token(char *token);
-int pevent_peek_char(void);
-const char *pevent_get_input_buf(void);
-unsigned long long pevent_get_input_buf_ptr(void);
+void tep_buffer_init(const char *buf, unsigned long long size);
+enum event_type tep_read_token(char **tok);
+void tep_free_token(char *token);
+int tep_peek_char(void);
+const char *tep_get_input_buf(void);
+unsigned long long tep_get_input_buf_ptr(void);
/* for debugging */
void tep_print_funcs(struct tep_handle *pevent);
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 3efab9b4298f..5e3f29736a25 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -51,8 +51,8 @@ static void show_error(char *error_buf, const char *fmt, ...)
int len;
int i;
- input = pevent_get_input_buf();
- index = pevent_get_input_buf_ptr();
+ input = tep_get_input_buf();
+ index = tep_get_input_buf_ptr();
len = input ? strlen(input) : 0;
if (len) {
@@ -72,7 +72,7 @@ static void show_error(char *error_buf, const char *fmt, ...)
static void free_token(char *token)
{
- pevent_free_token(token);
+ tep_free_token(token);
}
static enum event_type read_token(char **tok)
@@ -82,13 +82,13 @@ static enum event_type read_token(char **tok)
do {
free_token(token);
- type = pevent_read_token(&token);
+ type = tep_read_token(&token);
} while (type == EVENT_NEWLINE || type == EVENT_SPACE);
/* If token is = or ! check to see if the next char is ~ */
if (token &&
(strcmp(token, "=") == 0 || strcmp(token, "!") == 0) &&
- pevent_peek_char() == '~') {
+ tep_peek_char() == '~') {
/* append it */
*tok = malloc(3);
if (*tok == NULL) {
@@ -98,7 +98,7 @@ static enum event_type read_token(char **tok)
sprintf(*tok, "%c%c", *token, '~');
free_token(token);
/* Now remove the '~' from the buffer */
- pevent_read_token(&token);
+ tep_read_token(&token);
free_token(token);
} else
*tok = token;
@@ -1198,7 +1198,7 @@ process_event(struct event_format *event, const char *filter_str,
{
int ret;
- pevent_buffer_init(filter_str, strlen(filter_str));
+ tep_buffer_init(filter_str, strlen(filter_str));
ret = process_filter(event, parg, error_str, 0);
if (ret < 0)
@@ -1254,7 +1254,7 @@ filter_event(struct event_filter *filter, struct event_format *event,
static void filter_init_error_buf(struct event_filter *filter)
{
/* clear buffer to reset show error */
- pevent_buffer_init("", 0);
+ tep_buffer_init("", 0);
filter->error_buffer[0] = '\0';
}
--
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 ` Steven Rostedt [this message]
2018-08-18 11:54 ` [tip:perf/urgent] tools lib traceevent: Rename internal parser related APIs 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 ` [RFC][PATCH v2 24/24] tools/lib/traceevent: Rename static variables and functions in event-parse.c Steven Rostedt
2018-08-18 11:55 ` [tip:perf/urgent] tools lib traceevent: " 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.275281085@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).