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

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

tools lib traceevent: Rename pevent_register / unregister 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_register_print_function, pevent_unregister_print_function,
pevent_register_event_handler, pevent_unregister_event_handler,
pevent_register_function, pevent_register_trace_clock

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
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.524813185@goodmis.org


Signed-off-by: default avatarTzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 64e23790

tools/lib/traceevent/event-parse.c

+20 −20
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid) 
	return 0;

}



int pevent_register_trace_clock(struct tep_handle *pevent, const char *trace_clock)

int tep_register_trace_clock(struct tep_handle *pevent, const char *trace_clock)

{

	pevent->trace_clock = strdup(trace_clock);

	if (!pevent->trace_clock) {
@@ -544,7 +544,7 @@ pevent_find_function_address(struct tep_handle *pevent, unsigned long long addr) 
}



/**

 * pevent_register_function - register a function with a given address

 * tep_register_function - register a function with a given address

 * @pevent: handle for the pevent

 * @function: the function name to register

 * @addr: the address the function starts at
@@ -553,7 +553,7 @@ pevent_find_function_address(struct tep_handle *pevent, unsigned long long addr) 
 * This registers a function name with an address and module.

 * The @func passed in is duplicated.

 */

int pevent_register_function(struct tep_handle *pevent, char *func,

int tep_register_function(struct tep_handle *pevent, char *func,

			  unsigned long long addr, char *mod)

{

	struct func_list *item = malloc(sizeof(*item));
@@ -6477,7 +6477,7 @@ static void free_func_handle(struct tep_function_handler *func) 
}



/**

 * pevent_register_print_function - register a helper function

 * tep_register_print_function - register a helper function

 * @pevent: the handle to the pevent

 * @func: the function to process the helper function

 * @ret_type: the return type of the helper function
@@ -6491,7 +6491,7 @@ static void free_func_handle(struct tep_function_handler *func) 
 * The @parameters is a variable list of tep_func_arg_type enums that

 * must end with TEP_FUNC_ARG_VOID.

 */

int pevent_register_print_function(struct tep_handle *pevent,

int tep_register_print_function(struct tep_handle *pevent,

				tep_func_handler func,

				enum tep_func_arg_type ret_type,

				char *name, ...)
@@ -6569,7 +6569,7 @@ int pevent_register_print_function(struct tep_handle *pevent, 
}



/**

 * pevent_unregister_print_function - unregister a helper function

 * tep_unregister_print_function - unregister a helper function

 * @pevent: the handle to the pevent

 * @func: the function to process the helper function

 * @name: the name of the helper function
@@ -6578,7 +6578,7 @@ int pevent_register_print_function(struct tep_handle *pevent, 
 *

 * Returns 0 if the handler was removed successully, -1 otherwise.

 */

int pevent_unregister_print_function(struct tep_handle *pevent,

int tep_unregister_print_function(struct tep_handle *pevent,

				  tep_func_handler func, char *name)

{

	struct tep_function_handler *func_handle;
@@ -6615,7 +6615,7 @@ static struct event_format *pevent_search_event(struct tep_handle *pevent, int i 
}



/**

 * pevent_register_event_handler - register a way to parse an event

 * tep_register_event_handler - register a way to parse an event

 * @pevent: the handle to the pevent

 * @id: the id of the event to register

 * @sys_name: the system name the event belongs to
@@ -6631,7 +6631,7 @@ static struct event_format *pevent_search_event(struct tep_handle *pevent, int i 
 * If @id is >= 0, then it is used to find the event.

 * else @sys_name and @event_name are used.

 */

int pevent_register_event_handler(struct tep_handle *pevent, int id,

int tep_register_event_handler(struct tep_handle *pevent, int id,

			       const char *sys_name, const char *event_name,

			       tep_event_handler_func func, void *context)

{
@@ -6700,7 +6700,7 @@ static int handle_matches(struct event_handler *handler, int id, 
}



/**

 * pevent_unregister_event_handler - unregister an existing event handler

 * tep_unregister_event_handler - unregister an existing event handler

 * @pevent: the handle to the pevent

 * @id: the id of the event to unregister

 * @sys_name: the system name the handler belongs to
@@ -6715,7 +6715,7 @@ static int handle_matches(struct event_handler *handler, int id, 
 *

 * Returns 0 if handler was removed successfully, -1 if event was not found.

 */

int pevent_unregister_event_handler(struct tep_handle *pevent, int id,

int tep_unregister_event_handler(struct tep_handle *pevent, int id,

				 const char *sys_name, const char *event_name,

				 tep_event_handler_func func, void *context)

{

tools/lib/traceevent/event-parse.h

+15 −15
Original line number Diff line number Diff line
@@ -619,8 +619,8 @@ int tep_set_function_resolver(struct tep_handle *pevent, 
			      tep_func_resolver_t *func, void *priv);

void pevent_reset_function_resolver(struct tep_handle *pevent);

int tep_register_comm(struct tep_handle *pevent, const char *comm, int pid);

int pevent_register_trace_clock(struct tep_handle *pevent, const char *trace_clock);

int pevent_register_function(struct tep_handle *pevent, char *name,

int tep_register_trace_clock(struct tep_handle *pevent, const char *trace_clock);

int tep_register_function(struct tep_handle *pevent, char *name,

			  unsigned long long addr, char *mod);

int tep_register_print_string(struct tep_handle *pevent, const char *fmt,

			      unsigned long long addr);
@@ -673,17 +673,17 @@ int tep_print_func_field(struct trace_seq *s, const char *fmt, 
			 struct event_format *event, const char *name,

			 struct tep_record *record, int err);



int pevent_register_event_handler(struct tep_handle *pevent, int id,

int tep_register_event_handler(struct tep_handle *pevent, int id,

			       const char *sys_name, const char *event_name,

			       tep_event_handler_func func, void *context);

int pevent_unregister_event_handler(struct tep_handle *pevent, int id,

int tep_unregister_event_handler(struct tep_handle *pevent, int id,

				 const char *sys_name, const char *event_name,

				 tep_event_handler_func func, void *context);

int pevent_register_print_function(struct tep_handle *pevent,

int tep_register_print_function(struct tep_handle *pevent,

				tep_func_handler func,

				enum tep_func_arg_type ret_type,

				char *name, ...);

int pevent_unregister_print_function(struct tep_handle *pevent,

int tep_unregister_print_function(struct tep_handle *pevent,

				  tep_func_handler func, char *name);



struct format_field *tep_find_common_field(struct event_format *event, const char *name);

tools/lib/traceevent/plugin_cfg80211.c

+8 −8
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ process___le16_to_cpup(struct trace_seq *s, unsigned long long *args) 


int TEP_PLUGIN_LOADER(struct tep_handle *pevent)

{

	pevent_register_print_function(pevent,

	tep_register_print_function(pevent,

				    process___le16_to_cpup,

				    TEP_FUNC_ARG_INT,

				    "__le16_to_cpup",
@@ -38,6 +38,6 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent) 


void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent)

{

	pevent_unregister_print_function(pevent, process___le16_to_cpup,

	tep_unregister_print_function(pevent, process___le16_to_cpup,

				      "__le16_to_cpup");

}

tools/lib/traceevent/plugin_function.c

+4 −4
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static int function_handler(struct trace_seq *s, struct tep_record *record, 


int TEP_PLUGIN_LOADER(struct tep_handle *pevent)

{

	pevent_register_event_handler(pevent, -1, "ftrace", "function",

	tep_register_event_handler(pevent, -1, "ftrace", "function",

				   function_handler, NULL);



	tep_plugin_add_options("ftrace", plugin_options);
@@ -177,7 +177,7 @@ void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent) 
{

	int i, x;



	pevent_unregister_event_handler(pevent, -1, "ftrace", "function",

	tep_unregister_event_handler(pevent, -1, "ftrace", "function",

				     function_handler, NULL);



	for (i = 0; i <= cpus; i++) {

tools/lib/traceevent/plugin_hrtimer.c

+10 −10
Original line number Diff line number Diff line
@@ -68,21 +68,21 @@ static int timer_start_handler(struct trace_seq *s, 


int TEP_PLUGIN_LOADER(struct tep_handle *pevent)

{

	pevent_register_event_handler(pevent, -1,

	tep_register_event_handler(pevent, -1,

				   "timer", "hrtimer_expire_entry",

				   timer_expire_handler, NULL);



	pevent_register_event_handler(pevent, -1, "timer", "hrtimer_start",

	tep_register_event_handler(pevent, -1, "timer", "hrtimer_start",

				   timer_start_handler, NULL);

	return 0;

}



void TEP_PLUGIN_UNLOADER(struct tep_handle *pevent)

{

	pevent_unregister_event_handler(pevent, -1,

	tep_unregister_event_handler(pevent, -1,

				     "timer", "hrtimer_expire_entry",

				     timer_expire_handler, NULL);



	pevent_unregister_event_handler(pevent, -1, "timer", "hrtimer_start",

	tep_unregister_event_handler(pevent, -1, "timer", "hrtimer_start",

				     timer_start_handler, NULL);

}