From: "tip-bot for Tzvetomir Stoyanov (VMware)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: rostedt@goodmis.org, tz.stoyanov@gmail.com, acme@redhat.com,
hpa@zytor.com, akpm@linux-foundation.org, tglx@linutronix.de,
linux-kernel@vger.kernel.org, mingo@kernel.org,
y.karadz@gmail.com, peterz@infradead.org
Subject: [tip:perf/urgent] tools lib traceevent: Rename pevent_find_* APIs
Date: Sat, 18 Aug 2018 04:53:14 -0700 [thread overview]
Message-ID: <tip-610e1e4ff0431b3a86a0ebfcdb47828b8e082329@git.kernel.org> (raw)
In-Reply-To: <20180808180702.966965051@goodmis.org>
Commit-ID: 610e1e4ff0431b3a86a0ebfcdb47828b8e082329
Gitweb: https://git.kernel.org/tip/610e1e4ff0431b3a86a0ebfcdb47828b8e082329
Author: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
AuthorDate: Wed, 8 Aug 2018 14:03:05 -0400
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 13 Aug 2018 15:31:28 -0300
tools lib traceevent: Rename pevent_find_* 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_find_function, pevent_find_function_address,
pevent_find_event_by_name, pevent_find_event_by_record
Signed-off-by: Tzvetomir 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/20180808180702.966965051@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/traceevent/event-parse.c | 24 ++++++++++++------------
tools/lib/traceevent/event-parse.h | 8 ++++----
tools/lib/traceevent/parse-filter.c | 10 +++++-----
tools/lib/traceevent/plugin_function.c | 4 ++--
tools/lib/traceevent/plugin_kmem.c | 4 ++--
5 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 652b8ef6f4c7..53d866434478 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -503,7 +503,7 @@ find_func(struct tep_handle *pevent, unsigned long long addr)
}
/**
- * pevent_find_function - find a function by a given address
+ * tep_find_function - find a function by a given address
* @pevent: handle for the pevent
* @addr: the address to find the function with
*
@@ -511,7 +511,7 @@ find_func(struct tep_handle *pevent, unsigned long long addr)
* address. Note, the address does not have to be exact, it
* will select the function that would contain the address.
*/
-const char *pevent_find_function(struct tep_handle *pevent, unsigned long long addr)
+const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr)
{
struct func_map *map;
@@ -523,16 +523,16 @@ const char *pevent_find_function(struct tep_handle *pevent, unsigned long long a
}
/**
- * pevent_find_function_address - find a function address by a given address
+ * tep_find_function_address - find a function address by a given address
* @pevent: handle for the pevent
* @addr: the address to find the function with
*
* Returns the address the function starts at. This can be used in
- * conjunction with pevent_find_function to print both the function
+ * conjunction with tep_find_function to print both the function
* name and the function offset.
*/
unsigned long long
-pevent_find_function_address(struct tep_handle *pevent, unsigned long long addr)
+tep_find_function_address(struct tep_handle *pevent, unsigned long long addr)
{
struct func_map *map;
@@ -3498,7 +3498,7 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id)
}
/**
- * pevent_find_event_by_name - find an event by given name
+ * tep_find_event_by_name - find an event by given name
* @pevent: a handle to the pevent
* @sys: the system name to search for
* @name: the name of the event to search for
@@ -3507,8 +3507,8 @@ struct event_format *tep_find_event(struct tep_handle *pevent, int id)
* @sys. If @sys is NULL the first event with @name is returned.
*/
struct event_format *
-pevent_find_event_by_name(struct tep_handle *pevent,
- const char *sys, const char *name)
+tep_find_event_by_name(struct tep_handle *pevent,
+ const char *sys, const char *name)
{
struct event_format *event;
int i;
@@ -5433,7 +5433,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
}
/**
- * pevent_find_event_by_record - return the event from a given record
+ * tep_find_event_by_record - return the event from a given record
* @pevent: a handle to the pevent
* @record: The record to get the event from
*
@@ -5441,7 +5441,7 @@ static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
* is found.
*/
struct event_format *
-pevent_find_event_by_record(struct tep_handle *pevent, struct tep_record *record)
+tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record)
{
int type;
@@ -5564,7 +5564,7 @@ void tep_print_event(struct tep_handle *pevent, struct trace_seq *s,
{
struct event_format *event;
- event = pevent_find_event_by_record(pevent, record);
+ event = tep_find_event_by_record(pevent, record);
if (!event) {
int i;
int type = trace_parse_common_type(pevent, record->data);
@@ -6607,7 +6607,7 @@ static struct event_format *pevent_search_event(struct tep_handle *pevent, int i
if (sys_name && (strcmp(sys_name, event->system) != 0))
return NULL;
} else {
- event = pevent_find_event_by_name(pevent, sys_name, event_name);
+ event = tep_find_event_by_name(pevent, sys_name, event_name);
if (!event)
return NULL;
}
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 04ffc6e508cf..63ec6d419219 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -690,9 +690,9 @@ struct format_field *tep_find_common_field(struct event_format *event, const cha
struct format_field *tep_find_field(struct event_format *event, const char *name);
struct format_field *tep_find_any_field(struct event_format *event, const char *name);
-const char *pevent_find_function(struct tep_handle *pevent, unsigned long long addr);
+const char *tep_find_function(struct tep_handle *pevent, unsigned long long addr);
unsigned long long
-pevent_find_function_address(struct tep_handle *pevent, unsigned long long addr);
+tep_find_function_address(struct tep_handle *pevent, unsigned long long addr);
unsigned long long tep_read_number(struct tep_handle *pevent, const void *ptr, int size);
int tep_read_number_field(struct format_field *field, const void *data,
unsigned long long *value);
@@ -700,10 +700,10 @@ int tep_read_number_field(struct format_field *field, const void *data,
struct event_format *tep_find_event(struct tep_handle *pevent, int id);
struct event_format *
-pevent_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *name);
+tep_find_event_by_name(struct tep_handle *pevent, const char *sys, const char *name);
struct event_format *
-pevent_find_event_by_record(struct tep_handle *pevent, struct tep_record *record);
+tep_find_event_by_record(struct tep_handle *pevent, struct tep_record *record);
void tep_data_lat_fmt(struct tep_handle *pevent,
struct trace_seq *s, struct tep_record *record);
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 474d820e97e1..3efab9b4298f 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1478,7 +1478,7 @@ static int copy_filter_type(struct event_filter *filter,
/* Can't assume that the pevent's are the same */
sys = filter_type->event->system;
name = filter_type->event->name;
- event = pevent_find_event_by_name(filter->pevent, sys, name);
+ event = tep_find_event_by_name(filter->pevent, sys, name);
if (!event)
return -1;
@@ -1578,9 +1578,9 @@ int tep_update_trivial(struct event_filter *dest, struct event_filter *source,
if (src_pevent != dest_pevent) {
/* do a look up */
- event = pevent_find_event_by_name(src_pevent,
- event->system,
- event->name);
+ event = tep_find_event_by_name(src_pevent,
+ event->system,
+ event->name);
if (!event)
return -1;
}
@@ -1909,7 +1909,7 @@ static const char *get_field_str(struct filter_arg *arg, struct tep_record *reco
if (arg->str.field->flags & (FIELD_IS_POINTER | FIELD_IS_LONG))
/* convert to a kernel symbol */
- val = pevent_find_function(pevent, addr);
+ val = tep_find_function(pevent, addr);
if (val == NULL) {
/* just use the hex of the string name */
diff --git a/tools/lib/traceevent/plugin_function.c b/tools/lib/traceevent/plugin_function.c
index 0962120960eb..424747475d37 100644
--- a/tools/lib/traceevent/plugin_function.c
+++ b/tools/lib/traceevent/plugin_function.c
@@ -135,12 +135,12 @@ static int function_handler(struct trace_seq *s, struct tep_record *record,
if (tep_get_field_val(s, event, "ip", record, &function, 1))
return trace_seq_putc(s, '!');
- func = pevent_find_function(pevent, function);
+ func = tep_find_function(pevent, function);
if (tep_get_field_val(s, event, "parent_ip", record, &pfunction, 1))
return trace_seq_putc(s, '!');
- parent = pevent_find_function(pevent, pfunction);
+ parent = tep_find_function(pevent, pfunction);
if (parent && ftrace_indent->set)
index = add_and_get_index(parent, func, record->cpu);
diff --git a/tools/lib/traceevent/plugin_kmem.c b/tools/lib/traceevent/plugin_kmem.c
index 6d5938d82c66..73966b05abce 100644
--- a/tools/lib/traceevent/plugin_kmem.c
+++ b/tools/lib/traceevent/plugin_kmem.c
@@ -38,11 +38,11 @@ static int call_site_handler(struct trace_seq *s, struct tep_record *record,
if (tep_read_number_field(field, data, &val))
return 1;
- func = pevent_find_function(event->pevent, val);
+ func = tep_find_function(event->pevent, val);
if (!func)
return 1;
- addr = pevent_find_function_address(event->pevent, val);
+ addr = tep_find_function_address(event->pevent, val);
trace_seq_printf(s, "(%s+0x%x) ", func, (int)(val - addr));
return 1;
next prev parent reply other threads:[~2018-08-18 11:53 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-bot for Tzvetomir Stoyanov (VMware) [this message]
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 ` [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=tip-610e1e4ff0431b3a86a0ebfcdb47828b8e082329@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--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).