From: Tzvetomir Stoyanov (VMware) Date: Wed, 8 Aug 2018 18:02:56 +0000 (-0400) Subject: tools lib traceevent, perf tools: Rename traceevent_* APIs X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fc9b69710e0e5833c5d3e56c37cb56cfe89217c3;p=openwrt%2Fstaging%2Fblogic.git 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) Cc: Andrew Morton Cc: Peter Zijlstra Cc: Yordan Karadzhov (VMware) Cc: linux-trace-devel@vger.kernel.org Link: http://lkml.kernel.org/r/20180808180701.484691639@goodmis.org Signed-off-by: Steven Rostedt Signed-off-by: Arnaldo Carvalho de Melo --- 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; #define INVALID_PLUGIN_LIST_OPTION ((char **)((unsigned long)-1)) -struct plugin_list *traceevent_load_plugins(struct tep_handle *pevent); -void traceevent_unload_plugins(struct plugin_list *plugin_list, - struct tep_handle *pevent); +struct plugin_list *tep_load_plugins(struct tep_handle *pevent); +void tep_unload_plugins(struct plugin_list *plugin_list, + struct tep_handle *pevent); char **traceevent_plugin_list_options(void); void traceevent_plugin_free_options_list(char **list); int traceevent_plugin_add_options(const char *name, @@ -597,7 +597,7 @@ __data2host8(struct tep_handle *pevent, unsigned long long data) __data2host8(pevent, __val); \ }) -static inline int traceevent_host_bigendian(void) +static inline int tep_host_bigendian(void) { unsigned char str[] = { 0x1, 0x2, 0x3, 0x4 }; 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) * @s: the trace_seq descripter to write to * @prefix: The prefix string to add before listing the option name * @suffix: The suffix string ot append after the option name - * @list: The list of plugins (usually returned by traceevent_load_plugins() + * @list: The list of plugins (usually returned by tep_load_plugins() * * Writes to the trace_seq @s the list of plugins (files) that is - * returned by traceevent_load_plugins(). Use @prefix and @suffix for formating: + * returned by tep_load_plugins(). Use @prefix and @suffix for formating: * @prefix = " ", @suffix = "\n". */ void traceevent_print_plugins(struct trace_seq *s, @@ -431,7 +431,7 @@ load_plugins(struct tep_handle *pevent, const char *suffix, } struct plugin_list* -traceevent_load_plugins(struct tep_handle *pevent) +tep_load_plugins(struct tep_handle *pevent) { struct plugin_list *list = NULL; @@ -440,7 +440,7 @@ traceevent_load_plugins(struct tep_handle *pevent) } void -traceevent_unload_plugins(struct plugin_list *plugin_list, struct tep_handle *pevent) +tep_unload_plugins(struct plugin_list *plugin_list, struct tep_handle *pevent) { tep_plugin_unload_func func; 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) struct tep_handle *pevent = tep_alloc(); if (pevent) { - t->plugin_list = traceevent_load_plugins(pevent); + t->plugin_list = tep_load_plugins(pevent); t->pevent = pevent; } @@ -40,7 +40,7 @@ int trace_event__init(struct trace_event *t) static int trace_event__init2(void) { - int be = traceevent_host_bigendian(); + int be = tep_host_bigendian(); struct tep_handle *pevent; if (trace_event__init(&tevent)) @@ -65,7 +65,7 @@ int trace_event__register_resolver(struct machine *machine, void trace_event__cleanup(struct trace_event *t) { - traceevent_unload_plugins(t->plugin_list, t->pevent); + tep_unload_plugins(t->plugin_list, t->pevent); tep_free(t->pevent); }