Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca2921dd authored by Tzvetomir Stoyanov (VMware)'s avatar Tzvetomir Stoyanov (VMware) Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent, perf tools: Rename traceevent_plugin_* 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_plugin_list_options, traceevent_plugin_free_options_list,
traceevent_plugin_add_options, traceevent_plugin_remove_options,
traceevent_print_plugins

Signed-off-by: default avatarTzvetomir 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.089951638@goodmis.org


Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3cf47783

tools/lib/traceevent/event-parse.h

+8 −8
Original line number Diff line number Diff line
@@ -438,12 +438,12 @@ struct plugin_list; 
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,

char **tep_plugin_list_options(void);

void tep_plugin_free_options_list(char **list);

int tep_plugin_add_options(const char *name,

			   struct tep_plugin_option *options);

void traceevent_plugin_remove_options(struct tep_plugin_option *options);

void traceevent_print_plugins(struct trace_seq *s,

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);

tools/lib/traceevent/event-plugin.c

+14 −14
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int update_option_value(struct tep_plugin_option *op, const char *val) 
}



/**

 * traceevent_plugin_list_options - get list of plugin options

 * tep_plugin_list_options - get list of plugin options

 *

 * Returns an array of char strings that list the currently registered

 * plugin options in the format of <plugin>:<option>. This list can be
@@ -106,9 +106,9 @@ static int update_option_value(struct tep_plugin_option *op, const char *val) 
 * Returns NULL if there's no options registered. On error it returns

 * INVALID_PLUGIN_LIST_OPTION

 *

 * Must be freed with traceevent_plugin_free_options_list().

 * Must be freed with tep_plugin_free_options_list().

 */

char **traceevent_plugin_list_options(void)

char **tep_plugin_list_options(void)

{

	struct registered_plugin_options *reg;

	struct tep_plugin_option *op;
@@ -146,7 +146,7 @@ char **traceevent_plugin_list_options(void) 
	return INVALID_PLUGIN_LIST_OPTION;

}



void traceevent_plugin_free_options_list(char **list)

void tep_plugin_free_options_list(char **list)

{

	int i;
@@ -215,13 +215,13 @@ update_option(const char *file, struct tep_plugin_option *option) 
}



/**

 * traceevent_plugin_add_options - Add a set of options by a plugin

 * tep_plugin_add_options - Add a set of options by a plugin

 * @name: The name of the plugin adding the options

 * @options: The set of options being loaded

 *

 * Sets the options with the values that have been added by user.

 */

int traceevent_plugin_add_options(const char *name,

int tep_plugin_add_options(const char *name,

			   struct tep_plugin_option *options)

{

	struct registered_plugin_options *reg;
@@ -241,10 +241,10 @@ int traceevent_plugin_add_options(const char *name, 
}



/**

 * traceevent_plugin_remove_options - remove plugin options that were registered

 * @options: Options to removed that were registered with traceevent_plugin_add_options

 * tep_plugin_remove_options - remove plugin options that were registered

 * @options: Options to removed that were registered with tep_plugin_add_options

 */

void traceevent_plugin_remove_options(struct tep_plugin_option *options)

void tep_plugin_remove_options(struct tep_plugin_option *options)

{

	struct registered_plugin_options **last;

	struct registered_plugin_options *reg;
@@ -260,7 +260,7 @@ void traceevent_plugin_remove_options(struct tep_plugin_option *options) 
}



/**

 * traceevent_print_plugins - print out the list of plugins loaded

 * tep_print_plugins - print out the list of plugins loaded

 * @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
@@ -270,7 +270,7 @@ void traceevent_plugin_remove_options(struct tep_plugin_option *options) 
 * returned by tep_load_plugins(). Use @prefix and @suffix for formating:

 * @prefix = "  ", @suffix = "\n".

 */

void traceevent_print_plugins(struct trace_seq *s,

void tep_print_plugins(struct trace_seq *s,

		       const char *prefix, const char *suffix,

		       const struct plugin_list *list)

{

tools/lib/traceevent/plugin_function.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) 
	pevent_register_event_handler(pevent, -1, "ftrace", "function",

				      function_handler, NULL);



	traceevent_plugin_add_options("ftrace", plugin_options);

	tep_plugin_add_options("ftrace", plugin_options);



	return 0;

}
@@ -186,7 +186,7 @@ void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) 
		free(fstack[i].stack);

	}



	traceevent_plugin_remove_options(plugin_options);

	tep_plugin_remove_options(plugin_options);



	free(fstack);

	fstack = NULL;