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

Commit 9023c930 authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Rename (un)register_ftrace_event() to (un)register_trace_event() 



The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The functions (un)register_ftrace_event() is
really about trace_events, and the name should be register_trace_event()
instead.

Also renamed ftrace_event_reg() to trace_event_reg() for the same reason.

Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 645df987

include/linux/trace_events.h

+3 −3
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ struct trace_event { 
	struct trace_event_functions	*funcs;

};



extern int register_ftrace_event(struct trace_event *event);

extern int unregister_ftrace_event(struct trace_event *event);

extern int register_trace_event(struct trace_event *event);

extern int unregister_trace_event(struct trace_event *event);



/* Return values for print_line callback */

enum print_line_t {
@@ -216,7 +216,7 @@ struct ftrace_event_class { 
	int			(*raw_init)(struct ftrace_event_call *);

};



extern int ftrace_event_reg(struct ftrace_event_call *event,

extern int trace_event_reg(struct ftrace_event_call *event,

			    enum trace_reg type, void *data);



struct ftrace_event_buffer {

include/trace/perf.h

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
 *	.fields			= LIST_HEAD_INIT(event_class_##call.fields),

 *	.raw_init		= trace_event_raw_init,

 *	.probe			= ftrace_raw_event_##call,

 *	.reg			= ftrace_event_reg,

 *	.reg			= trace_event_reg,

 * };

 *

 * static struct ftrace_event_call event_<call> = {
@@ -219,7 +219,7 @@ static struct ftrace_event_class __used __refdata event_class_##call = { \ 
	.fields			= LIST_HEAD_INIT(event_class_##call.fields),\

	.raw_init		= trace_event_raw_init,			\

	.probe			= ftrace_raw_event_##call,		\

	.reg			= ftrace_event_reg,			\

	.reg			= trace_event_reg,			\

	_TRACE_PERF_INIT(call)						\

};

kernel/trace/blktrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1450,14 +1450,14 @@ static struct trace_event trace_blk_event = { 


static int __init init_blk_tracer(void)

{

	if (!register_ftrace_event(&trace_blk_event)) {

	if (!register_trace_event(&trace_blk_event)) {

		pr_warning("Warning: could not register block events\n");

		return 1;

	}



	if (register_tracer(&blk_tracer) != 0) {

		pr_warning("Warning: could not register the block tracer\n");

		unregister_ftrace_event(&trace_blk_event);

		unregister_trace_event(&trace_blk_event);

		return 1;

	}

kernel/trace/trace_branch.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ __init static int init_branch_tracer(void) 
{

	int ret;



	ret = register_ftrace_event(&trace_branch_event);

	ret = register_trace_event(&trace_branch_event);

	if (!ret) {

		printk(KERN_WARNING "Warning: could not register "

				    "branch events\n");

kernel/trace/trace_events.c

+5 −5
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ int trace_event_raw_init(struct ftrace_event_call *call) 
{

	int id;



	id = register_ftrace_event(&call->event);

	id = register_trace_event(&call->event);

	if (!id)

		return -ENODEV;
@@ -252,7 +252,7 @@ void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer) 
}

EXPORT_SYMBOL_GPL(ftrace_event_buffer_commit);



int ftrace_event_reg(struct ftrace_event_call *call,

int trace_event_reg(struct ftrace_event_call *call,

		    enum trace_reg type, void *data)

{

	struct ftrace_event_file *file = data;
@@ -288,7 +288,7 @@ int ftrace_event_reg(struct ftrace_event_call *call, 
	}

	return 0;

}

EXPORT_SYMBOL_GPL(ftrace_event_reg);

EXPORT_SYMBOL_GPL(trace_event_reg);



void trace_event_enable_cmd_record(bool enable)

{
@@ -1673,7 +1673,7 @@ static void event_remove(struct ftrace_event_call *call) 
	} while_for_each_event_file();



	if (call->event.funcs)

		__unregister_ftrace_event(&call->event);

		__unregister_trace_event(&call->event);

	remove_event_from_tracers(call);

	list_del(&call->list);

}