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 06/24] tools/lib/traceevent, tools/perf: Rename pevent parse APIs
Date: Wed, 1 Aug 2018 15:41:38 +0300 [thread overview]
Message-ID: <20180801124156.20894-7-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
APIs: pevent_parse_event, pevent_parse_format, pevent_parse_header_page
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
tools/lib/traceevent/event-parse.c | 12 ++++++------
tools/lib/traceevent/event-parse.h | 6 +++---
tools/perf/util/trace-event-parse.c | 4 ++--
tools/perf/util/trace-event-read.c | 2 +-
tools/perf/util/trace-event.c | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 6610519c5a7f..fb6eac674149 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -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
@@ -5941,7 +5941,7 @@ 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 tep_parse_header_page(struct tep_handle *pevent, char *buf, unsigned long size,
int long_size)
{
int ignore;
@@ -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
@@ -6185,7 +6185,7 @@ __pevent_parse_event(struct tep_handle *pevent,
*
* /sys/kernel/debug/tracing/events/.../.../format
*/
-enum pevent_errno pevent_parse_format(struct tep_handle *pevent,
+enum pevent_errno tep_parse_format(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf,
unsigned long size, const char *sys)
@@ -6194,7 +6194,7 @@ enum pevent_errno pevent_parse_format(struct tep_handle *pevent,
}
/**
- * 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
@@ -6207,7 +6207,7 @@ 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,
+enum pevent_errno tep_parse_event(struct tep_handle *pevent, const char *buf,
unsigned long size, const char *sys)
{
struct event_format *event = NULL;
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 41b12ffb2338..7c90ddac77c5 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -639,12 +639,12 @@ 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 tep_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,
+enum pevent_errno tep_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,
+enum pevent_errno tep_parse_format(struct tep_handle *pevent,
struct event_format **eventp,
const char *buf,
unsigned long size, const char *sys);
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 0a769a340fc9..f8b91f3813ca 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -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,
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 43ba127979e9..b0ba65681558 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -235,7 +235,7 @@ static int read_header_files(struct tep_handle *pevent)
return -1;
}
- if (!pevent_parse_header_page(pevent, header_page, size,
+ if (!tep_parse_header_page(pevent, header_page, size,
pevent_get_long_size(pevent))) {
/*
* The commit field in the page is of type long,
diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c
index 116fffa788b9..eed1c11c1915 100644
--- a/tools/perf/util/trace-event.c
+++ b/tools/perf/util/trace-event.c
@@ -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;
--
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 ` Tzvetomir Stoyanov (VMware) [this message]
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 ` [PATCH 24/24] tools/lib/traceevent: Rename static variables and functions in event-parse.c Tzvetomir Stoyanov (VMware)
-- 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 06/24] tools/lib/traceevent, tools/perf: Rename pevent parse APIs 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-7-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).