diff options
author | Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> | 2018-08-08 14:02:56 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-08-13 14:22:16 -0400 |
commit | fc9b69710e0e5833c5d3e56c37cb56cfe89217c3 (patch) | |
tree | c72be6b2a2d5d9b5260252838b191b1264f7d3f2 | |
parent | ece2a4f48386acf7e35a751008976c9dda8d6232 (diff) |
tools lib traceevent, perf tools: Rename traceevent_* 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 "traceevent_". This
changes APIs: traceevent_host_bigendian, traceevent_load_plugins and
traceevent_unload_plugins
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/20180808180701.484691639@goodmis.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/lib/traceevent/event-parse.h | 8 | ||||
-rw-r--r-- | tools/lib/traceevent/event-plugin.c | 8 | ||||
-rw-r--r-- | tools/perf/util/trace-event.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h index a68591c8dec3..97abeaced9c3 100644 --- a/tools/lib/traceevent/event-parse.h +++ b/tools/lib/traceevent/event-parse.h | |||
@@ -435,9 +435,9 @@ struct plugin_list; | |||
435 | 435 | ||
436 | #define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1)) | 436 | #define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1)) |
437 | 437 | ||
438 | struct plugin_list *traceevent_load_plugins(struct tep_handle *pevent); | 438 | struct plugin_list *tep_load_plugins(struct tep_handle *pevent); |
439 | void traceevent_unload_plugins(struct plugin_list *plugin_list, | 439 | void tep_unload_plugins(struct plugin_list *plugin_list, |
440 | struct tep_handle *pevent); | 440 | struct tep_handle *pevent); |
441 | char **traceevent_plugin_list_options(void); | 441 | char **traceevent_plugin_list_options(void); |
442 | void traceevent_plugin_free_options_list(char **list); | 442 | void traceevent_plugin_free_options_list(char **list); |
443 | int traceevent_plugin_add_options(const char *name, | 443 | int traceevent_plugin_add_options(const char *name, |
@@ -597,7 +597,7 @@ __data2host8(struct tep_handle *pevent, unsigned long long data) | |||
597 | __data2host8(pevent, __val); \ | 597 | __data2host8(pevent, __val); \ |
598 | }) | 598 | }) |
599 | 599 | ||
600 | static inline int traceevent_host_bigendian(void) | 600 | static inline int tep_host_bigendian(void) |
601 | { | 601 | { |
602 | unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 }; | 602 | unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 }; |
603 | unsigned int val; | 603 | unsigned int val; |
diff --git a/tools/lib/traceevent/event-plugin.c b/tools/lib/traceevent/event-plugin.c index 8c91c8f0abd9..39859cee7712 100644 --- a/tools/lib/traceevent/event-plugin.c +++ b/tools/lib/traceevent/event-plugin.c | |||
@@ -264,10 +264,10 @@ void traceevent_plugin_remove_options(struct tep_plugin_option *options) | |||
264 | * @s: the trace_seq descripter to write to | 264 | * @s: the trace_seq descripter to write to |
265 | * @prefix: The prefix string to add before listing the option name | 265 | * @prefix: The prefix string to add before listing the option name |
266 | * @suffix: The suffix string ot append after the option name | 266 | * @suffix: The suffix string ot append after the option name |
267 | * @list: The list of plugins (usually returned by traceevent_load_plugins() | 267 | * @list: The list of plugins (usually returned by tep_load_plugins() |
268 | * | 268 | * |
269 | * Writes to the trace_seq @s the list of plugins (files) that is | 269 | * Writes to the trace_seq @s the list of plugins (files) that is |
270 | * returned by traceevent_load_plugins(). Use @prefix and @suffix for formating: | 270 | * returned by tep_load_plugins(). Use @prefix and @suffix for formating: |
271 | * @prefix = " ", @suffix = "\n". | 271 | * @prefix = " ", @suffix = "\n". |
272 | */ | 272 | */ |
273 | void traceevent_print_plugins(struct trace_seq *s, | 273 | void traceevent_print_plugins(struct trace_seq *s, |
@@ -431,7 +431,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix, | |||
431 | } | 431 | } |
432 | 432 | ||
433 | struct plugin_list* | 433 | struct plugin_list* |
434 | traceevent_load_plugins(struct tep_handle *pevent) | 434 | tep_load_plugins(struct tep_handle *pevent) |
435 | { | 435 | { |
436 | struct plugin_list *list = NULL; | 436 | struct plugin_list *list = NULL; |
437 | 437 | ||
@@ -440,7 +440,7 @@ traceevent_load_plugins(struct tep_handle *pevent) | |||
440 | } | 440 | } |
441 | 441 | ||
442 | void | 442 | void |
443 | traceevent_unload_plugins(struct plugin_list *plugin_list, struct tep_handle *pevent) | 443 | tep_unload_plugins(struct plugin_list *plugin_list, struct tep_handle *pevent) |
444 | { | 444 | { |
445 | tep_plugin_unload_func func; | 445 | tep_plugin_unload_func func; |
446 | struct plugin_list *list; | 446 | struct plugin_list *list; |
diff --git a/tools/perf/util/trace-event.c b/tools/perf/util/trace-event.c index 679c93644a08..3102e8be81f5 100644 --- a/tools/perf/util/trace-event.c +++ b/tools/perf/util/trace-event.c | |||
@@ -31,7 +31,7 @@ int trace_event__init(struct trace_event *t) | |||
31 | struct tep_handle *pevent = tep_alloc(); | 31 | struct tep_handle *pevent = tep_alloc(); |
32 | 32 | ||
33 | if (pevent) { | 33 | if (pevent) { |
34 | t->plugin_list = traceevent_load_plugins(pevent); | 34 | t->plugin_list = tep_load_plugins(pevent); |
35 | t->pevent = pevent; | 35 | t->pevent = pevent; |
36 | } | 36 | } |
37 | 37 | ||
@@ -40,7 +40,7 @@ int trace_event__init(struct trace_event *t) | |||
40 | 40 | ||
41 | static int trace_event__init2(void) | 41 | static int trace_event__init2(void) |
42 | { | 42 | { |
43 | int be = traceevent_host_bigendian(); | 43 | int be = tep_host_bigendian(); |
44 | struct tep_handle *pevent; | 44 | struct tep_handle *pevent; |
45 | 45 | ||
46 | if (trace_event__init(&tevent)) | 46 | if (trace_event__init(&tevent)) |
@@ -65,7 +65,7 @@ int trace_event__register_resolver(struct machine *machine, | |||
65 | 65 | ||
66 | void trace_event__cleanup(struct trace_event *t) | 66 | void trace_event__cleanup(struct trace_event *t) |
67 | { | 67 | { |
68 | traceevent_unload_plugins(t->plugin_list, t->pevent); | 68 | tep_unload_plugins(t->plugin_list, t->pevent); |
69 | tep_free(t->pevent); | 69 | tep_free(t->pevent); |
70 | } | 70 | } |
71 | 71 | ||