From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>,
Ingo Molnar <mingo@kernel.org>, Jiri Olsa <jolsa@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-trace-devel@vger.kernel.org,
Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
Subject: [PATCH 13/15] tools/lib/traceevent: Rename struct plugin_list to struct tep_plugin_list
Date: Wed, 19 Sep 2018 14:56:56 -0400 [thread overview]
Message-ID: <20180919185724.586889128@goodmis.org> (raw)
In-Reply-To: 20180919185643.358126338@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_". This renames struct plugin_list
to struct tep_plugin_list
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tools/lib/traceevent/event-parse.h | 8 ++++----
tools/lib/traceevent/event-plugin.c | 18 +++++++++---------
tools/perf/util/trace-event.h | 4 ++--
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 1abf15882460..2a7b0a857f39 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -389,12 +389,12 @@ enum tep_errno {
};
#undef _PE
-struct plugin_list;
+struct tep_plugin_list;
#define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1))
-struct plugin_list *tep_load_plugins(struct tep_handle *pevent);
-void tep_unload_plugins(struct plugin_list *plugin_list,
+struct tep_plugin_list *tep_load_plugins(struct tep_handle *pevent);
+void tep_unload_plugins(struct tep_plugin_list *plugin_list,
struct tep_handle *pevent);
char **tep_plugin_list_options(void);
void tep_plugin_free_options_list(char **list);
@@ -403,7 +403,7 @@ int tep_plugin_add_options(const char *name,
void tep_plugin_remove_options(struct tep_plugin_option *options);
void tep_print_plugins(struct trace_seq *s,
const char *prefix, const char *suffix,
- const struct plugin_list *list);
+ const struct tep_plugin_list *list);
struct cmdline;
struct cmdline_list;
diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c
index ec16a103c0cc..46eb64eb0c2e 100644
--- a/tools/lib/traceevent/event-plugin.c
+++ b/tools/lib/traceevent/event-plugin.c
@@ -31,8 +31,8 @@ static struct trace_plugin_options {
char *value;
} *trace_plugin_options;
-struct plugin_list {
- struct plugin_list *next;
+struct tep_plugin_list {
+ struct tep_plugin_list *next;
char *name;
void *handle;
};
@@ -259,7 +259,7 @@ void tep_plugin_remove_options(struct tep_plugin_option *options)
*/
void tep_print_plugins(struct trace_seq *s,
const char *prefix, const char *suffix,
- const struct plugin_list *list)
+ const struct tep_plugin_list *list)
{
while (list) {
trace_seq_printf(s, "%s%s%s", prefix, list->name, suffix);
@@ -271,9 +271,9 @@ static void
load_plugin(struct tep_handle *pevent, const char *path,
const char *file, void *data)
{
- struct plugin_list **plugin_list = data;
+ struct tep_plugin_list **plugin_list = data;
tep_plugin_load_func func;
- struct plugin_list *list;
+ struct tep_plugin_list *list;
const char *alias;
char *plugin;
void *handle;
@@ -417,20 +417,20 @@ load_plugins(struct tep_handle *pevent, const char *suffix,
free(path);
}
-struct plugin_list*
+struct tep_plugin_list*
tep_load_plugins(struct tep_handle *pevent)
{
- struct plugin_list *list = NULL;
+ struct tep_plugin_list *list = NULL;
load_plugins(pevent, ".so", load_plugin, &list);
return list;
}
void
-tep_unload_plugins(struct plugin_list *plugin_list, struct tep_handle *pevent)
+tep_unload_plugins(struct tep_plugin_list *plugin_list, struct tep_handle *pevent)
{
tep_plugin_unload_func func;
- struct plugin_list *list;
+ struct tep_plugin_list *list;
while (plugin_list) {
list = plugin_list;
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index 2da6eff0caaf..f024d73bfc40 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -11,11 +11,11 @@ struct perf_sample;
union perf_event;
struct perf_tool;
struct thread;
-struct plugin_list;
+struct tep_plugin_list;
struct trace_event {
struct tep_handle *pevent;
- struct plugin_list *plugin_list;
+ struct tep_plugin_list *plugin_list;
};
int trace_event__init(struct trace_event *t);
--
2.18.0
next prev parent reply other threads:[~2018-09-20 0:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 18:56 [PATCH 00/15] tools/lib/traceevent: Namespace updates to make traceevent into a library Steven Rostedt
2018-09-19 18:56 ` [PATCH 01/15] tools/lib/traceevent, tools/perf: Rename struct event_format to struct tep_event_format Steven Rostedt
2018-09-19 18:56 ` [PATCH 02/15] tools/lib/traceevent, tools/perf: Rename struct format{_field} to struct tep_format{_field} Steven Rostedt
2018-09-19 18:56 ` [PATCH 03/15] tools/lib/traceevent, tools/perf: Rename enum format_flags to enum tep_format_flags Steven Rostedt
2018-09-19 18:56 ` [PATCH 04/15] tools/lib/traceevent: Rename enum event_{sort_}type to enum tep_event_{sort_}type Steven Rostedt
2018-09-19 18:56 ` [PATCH 05/15] tools/lib/traceevent: Add prefix TEP_ to all EVENT_FL_* flags Steven Rostedt
2018-09-19 18:56 ` [PATCH 06/15] tools/lib/traceevent, tools/perf: Add prefix tep_ to all print_* structures Steven Rostedt
2018-09-19 18:56 ` [PATCH 07/15] tools/lib/traceevent, tools/perf: Rename enum print_arg_type to enum tep_print_arg_type Steven Rostedt
2018-09-19 18:56 ` [PATCH 08/15] tools/lib/traceevent: Add prefix tep_ to enums filter_{boolean,op,cmp}_type Steven Rostedt
2018-09-19 18:56 ` [PATCH 09/15] tools/lib/traceevent: Add prefix tep_ to enums filter_{exp,arg}_type Steven Rostedt
2018-09-19 18:56 ` [PATCH 10/15] tools/lib/traceevent: Add prefix tep_ to struct filter_{arg,value_type} Steven Rostedt
2018-09-19 18:56 ` [PATCH 11/15] tools/lib/traceevent: Add prefix tep_ to various structs filter_arg_* Steven Rostedt
2018-09-19 18:56 ` [PATCH 12/15] tools/lib/traceevent: Add prefix tep_ to structs filter_type and event_filter Steven Rostedt
2018-09-19 18:56 ` Steven Rostedt [this message]
2018-09-19 18:56 ` [PATCH 14/15] tools/lib/traceevent: Rename data2host*() APIs Steven Rostedt
2018-09-19 18:56 ` [PATCH 15/15] tools/lib/traceevent: Add prefix tep_ to enum filter_trivial_type Steven Rostedt
2018-09-23 18:56 ` [PATCH 00/15] tools/lib/traceevent: Namespace updates to make traceevent into a library Jiri Olsa
2018-09-24 8:55 ` Steven Rostedt
2018-09-24 14:16 ` Arnaldo Carvalho de Melo
2018-09-24 15:19 ` Steven Rostedt
2018-09-24 15:21 ` Arnaldo Carvalho de Melo
2018-09-24 17:48 ` Jiri Olsa
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=20180919185724.586889128@goodmis.org \
--to=rostedt@goodmis.org \
--cc=acme@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-devel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=tz.stoyanov@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).