OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2015-05-05 09:39:12 -04:00 committed by Steven Rostedt
parent 645df987f7
commit 9023c93090
10 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/trace_events.h
View File

@ -132,8 +132,8 @@ struct trace_event {
struct trace_event_functions *funcs; struct trace_event_functions *funcs;
}; };
extern int register_ftrace_event(struct trace_event *event); extern int register_trace_event(struct trace_event *event);
extern int unregister_ftrace_event(struct trace_event *event); extern int unregister_trace_event(struct trace_event *event);
/* Return values for print_line callback */ /* Return values for print_line callback */
enum print_line_t { enum print_line_t {
@ -216,7 +216,7 @@ struct ftrace_event_class {
int (*raw_init)(struct ftrace_event_call *); 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); enum trace_reg type, void *data);
struct ftrace_event_buffer { struct ftrace_event_buffer {

4
include/trace/perf.h
View File

@ -69,7 +69,7 @@
* .fields = LIST_HEAD_INIT(event_class_##call.fields), * .fields = LIST_HEAD_INIT(event_class_##call.fields),
* .raw_init = trace_event_raw_init, * .raw_init = trace_event_raw_init,
* .probe = ftrace_raw_event_##call, * .probe = ftrace_raw_event_##call,
* .reg = ftrace_event_reg, * .reg = trace_event_reg,
* }; * };
* *
* static struct ftrace_event_call event_<call> = { * 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),\ .fields = LIST_HEAD_INIT(event_class_##call.fields),\
.raw_init = trace_event_raw_init, \ .raw_init = trace_event_raw_init, \
.probe = ftrace_raw_event_##call, \ .probe = ftrace_raw_event_##call, \
.reg = ftrace_event_reg, \ .reg = trace_event_reg, \
_TRACE_PERF_INIT(call) \ _TRACE_PERF_INIT(call) \
}; };

4
kernel/trace/blktrace.c
View File

@ -1450,14 +1450,14 @@ static struct trace_event trace_blk_event = {
static int __init init_blk_tracer(void) 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"); pr_warning("Warning: could not register block events\n");
return 1; return 1;
} }
if (register_tracer(&blk_tracer) != 0) { if (register_tracer(&blk_tracer) != 0) {
pr_warning("Warning: could not register the block tracer\n"); pr_warning("Warning: could not register the block tracer\n");
unregister_ftrace_event(&trace_blk_event); unregister_trace_event(&trace_blk_event);
return 1; return 1;
} }

2
kernel/trace/trace_branch.c
View File

@ -191,7 +191,7 @@ __init static int init_branch_tracer(void)
{ {
int ret; int ret;
ret = register_ftrace_event(&trace_branch_event); ret = register_trace_event(&trace_branch_event);
if (!ret) { if (!ret) {
printk(KERN_WARNING "Warning: could not register " printk(KERN_WARNING "Warning: could not register "
"branch events\n"); "branch events\n");

10
kernel/trace/trace_events.c
View File

@ -182,7 +182,7 @@ int trace_event_raw_init(struct ftrace_event_call *call)
{ {
int id; int id;
id = register_ftrace_event(&call->event); id = register_trace_event(&call->event);
if (!id) if (!id)
return -ENODEV; return -ENODEV;
@ -252,8 +252,8 @@ void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer)
} }
EXPORT_SYMBOL_GPL(ftrace_event_buffer_commit); 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) enum trace_reg type, void *data)
{ {
struct ftrace_event_file *file = data; struct ftrace_event_file *file = data;
@ -288,7 +288,7 @@ int ftrace_event_reg(struct ftrace_event_call *call,
} }
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ftrace_event_reg); EXPORT_SYMBOL_GPL(trace_event_reg);
void trace_event_enable_cmd_record(bool enable) 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(); } while_for_each_event_file();
if (call->event.funcs) if (call->event.funcs)
__unregister_ftrace_event(&call->event); __unregister_trace_event(&call->event);
remove_event_from_tracers(call); remove_event_from_tracers(call);
list_del(&call->list); list_del(&call->list);
} }

4
kernel/trace/trace_functions_graph.c
View File

@ -1454,12 +1454,12 @@ static __init int init_graph_trace(void)
{ {
max_bytes_for_cpu = snprintf(NULL, 0, "%d", nr_cpu_ids - 1); max_bytes_for_cpu = snprintf(NULL, 0, "%d", nr_cpu_ids - 1);
if (!register_ftrace_event(&graph_trace_entry_event)) { if (!register_trace_event(&graph_trace_entry_event)) {
pr_warning("Warning: could not register graph trace events\n"); pr_warning("Warning: could not register graph trace events\n");
return 1; return 1;
} }
if (!register_ftrace_event(&graph_trace_ret_event)) { if (!register_trace_event(&graph_trace_ret_event)) {
pr_warning("Warning: could not register graph trace events\n"); pr_warning("Warning: could not register graph trace events\n");
return 1; return 1;
} }

4
kernel/trace/trace_kprobe.c
View File

@ -1290,7 +1290,7 @@ static int register_kprobe_event(struct trace_kprobe *tk)
} }
if (set_print_fmt(&tk->tp, trace_kprobe_is_return(tk)) < 0) if (set_print_fmt(&tk->tp, trace_kprobe_is_return(tk)) < 0)
return -ENOMEM; return -ENOMEM;
ret = register_ftrace_event(&call->event); ret = register_trace_event(&call->event);
if (!ret) { if (!ret) {
kfree(call->print_fmt); kfree(call->print_fmt);
return -ENODEV; return -ENODEV;
@ -1303,7 +1303,7 @@ static int register_kprobe_event(struct trace_kprobe *tk)
pr_info("Failed to register kprobe event: %s\n", pr_info("Failed to register kprobe event: %s\n",
ftrace_event_name(call)); ftrace_event_name(call));
kfree(call->print_fmt); kfree(call->print_fmt);
unregister_ftrace_event(&call->event); unregister_trace_event(&call->event);
} }
return ret; return ret;
} }

18
kernel/trace/trace_output.c
View File

@ -693,7 +693,7 @@ void trace_event_read_unlock(void)
} }
/** /**
* register_ftrace_event - register output for an event type * register_trace_event - register output for an event type
* @event: the event type to register * @event: the event type to register
* *
* Event types are stored in a hash and this hash is used to * Event types are stored in a hash and this hash is used to
@ -707,7 +707,7 @@ void trace_event_read_unlock(void)
* *
* Returns the event type number or zero on error. * Returns the event type number or zero on error.
*/ */
int register_ftrace_event(struct trace_event *event) int register_trace_event(struct trace_event *event)
{ {
unsigned key; unsigned key;
int ret = 0; int ret = 0;
@ -771,12 +771,12 @@ int register_ftrace_event(struct trace_event *event)
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(register_ftrace_event); EXPORT_SYMBOL_GPL(register_trace_event);
/* /*
* Used by module code with the trace_event_sem held for write. * Used by module code with the trace_event_sem held for write.
*/ */
int __unregister_ftrace_event(struct trace_event *event) int __unregister_trace_event(struct trace_event *event)
{ {
hlist_del(&event->node); hlist_del(&event->node);
list_del(&event->list); list_del(&event->list);
@ -784,18 +784,18 @@ int __unregister_ftrace_event(struct trace_event *event)
} }
/** /**
* unregister_ftrace_event - remove a no longer used event * unregister_trace_event - remove a no longer used event
* @event: the event to remove * @event: the event to remove
*/ */
int unregister_ftrace_event(struct trace_event *event) int unregister_trace_event(struct trace_event *event)
{ {
down_write(&trace_event_sem); down_write(&trace_event_sem);
__unregister_ftrace_event(event); __unregister_trace_event(event);
up_write(&trace_event_sem); up_write(&trace_event_sem);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(unregister_ftrace_event); EXPORT_SYMBOL_GPL(unregister_trace_event);
/* /*
* Standard events * Standard events
@ -1243,7 +1243,7 @@ __init static int init_events(void)
for (i = 0; events[i]; i++) { for (i = 0; events[i]; i++) {
event = events[i]; event = events[i];
ret = register_ftrace_event(event); ret = register_trace_event(event);
if (!ret) { if (!ret) {
printk(KERN_WARNING "event %d failed to register\n", printk(KERN_WARNING "event %d failed to register\n",
event->type); event->type);

2
kernel/trace/trace_output.h
View File

@ -32,7 +32,7 @@ extern int
trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry); trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry);
/* used by module unregistering */ /* used by module unregistering */
extern int __unregister_ftrace_event(struct trace_event *event); extern int __unregister_trace_event(struct trace_event *event);
extern struct rw_semaphore trace_event_sem; extern struct rw_semaphore trace_event_sem;
#define SEQ_PUT_FIELD(s, x) \ #define SEQ_PUT_FIELD(s, x) \

4
kernel/trace/trace_uprobe.c
View File

@ -1283,7 +1283,7 @@ static int register_uprobe_event(struct trace_uprobe *tu)
if (set_print_fmt(&tu->tp, is_ret_probe(tu)) < 0) if (set_print_fmt(&tu->tp, is_ret_probe(tu)) < 0)
return -ENOMEM; return -ENOMEM;
ret = register_ftrace_event(&call->event); ret = register_trace_event(&call->event);
if (!ret) { if (!ret) {
kfree(call->print_fmt); kfree(call->print_fmt);
return -ENODEV; return -ENODEV;
@ -1297,7 +1297,7 @@ static int register_uprobe_event(struct trace_uprobe *tu)
pr_info("Failed to register uprobe event: %s\n", pr_info("Failed to register uprobe event: %s\n",
ftrace_event_name(call)); ftrace_event_name(call));
kfree(call->print_fmt); kfree(call->print_fmt);
unregister_ftrace_event(&call->event); unregister_trace_event(&call->event);
} }
return ret; return ret;