leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tracing: Rename ftrace_event_buffer to trace_event_buffer.

Browse Source 
The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_event_buffer functions and data
structures are for trace_events and not for function hooks. Rename them
to trace_event_buffer*.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2015-05-05 13:18:46 -04:00 committed by Steven Rostedt
parent 2425bcb924
commit 3f795dcfc7
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/linux/trace_events.h
View File

@ -219,7 +219,7 @@ struct trace_event_class {
extern int trace_event_reg(struct trace_event_call *event, extern int trace_event_reg(struct trace_event_call *event,
enum trace_reg type, void *data); enum trace_reg type, void *data);
struct ftrace_event_buffer { struct trace_event_buffer {
struct ring_buffer *buffer; struct ring_buffer *buffer;
struct ring_buffer_event *event; struct ring_buffer_event *event;
struct trace_event_file *trace_file; struct trace_event_file *trace_file;
@ -228,11 +228,11 @@ struct ftrace_event_buffer {
int pc; int pc;
}; };
void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
struct trace_event_file *trace_file, struct trace_event_file *trace_file,
unsigned long len); unsigned long len);
void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer); void trace_event_buffer_commit(struct trace_event_buffer *fbuffer);
enum { enum {
TRACE_EVENT_FL_FILTERED_BIT, TRACE_EVENT_FL_FILTERED_BIT,

6
include/trace/perf.h
View File

@ -155,7 +155,7 @@ ftrace_raw_event_##call(void *__data, proto) \
{ \ { \
struct trace_event_file *trace_file = __data; \ struct trace_event_file *trace_file = __data; \
struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
struct ftrace_event_buffer fbuffer; \ struct trace_event_buffer fbuffer; \
struct ftrace_raw_##call *entry; \ struct ftrace_raw_##call *entry; \
int __data_size; \ int __data_size; \
\ \
@ -164,7 +164,7 @@ ftrace_raw_event_##call(void *__data, proto) \
\ \
__data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \
\ \
entry = ftrace_event_buffer_reserve(&fbuffer, trace_file, \ entry = trace_event_buffer_reserve(&fbuffer, trace_file, \
sizeof(*entry) + __data_size); \ sizeof(*entry) + __data_size); \
\ \
if (!entry) \ if (!entry) \
@ -174,7 +174,7 @@ ftrace_raw_event_##call(void *__data, proto) \
\ \
{ assign; } \ { assign; } \
\ \
ftrace_event_buffer_commit(&fbuffer); \ trace_event_buffer_commit(&fbuffer); \
} }
/* /*
* The ftrace_test_probe is compiled out, it is only here as a build time check * The ftrace_test_probe is compiled out, it is only here as a build time check

14
kernel/trace/trace_events.c
View File

@ -190,9 +190,9 @@ int trace_event_raw_init(struct trace_event_call *call)
} }
EXPORT_SYMBOL_GPL(trace_event_raw_init); EXPORT_SYMBOL_GPL(trace_event_raw_init);
void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer, void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
struct trace_event_file *trace_file, struct trace_event_file *trace_file,
unsigned long len) unsigned long len)
{ {
struct trace_event_call *event_call = trace_file->event_call; struct trace_event_call *event_call = trace_file->event_call;
@ -210,11 +210,11 @@ void *ftrace_event_buffer_reserve(struct ftrace_event_buffer *fbuffer,
fbuffer->entry = ring_buffer_event_data(fbuffer->event); fbuffer->entry = ring_buffer_event_data(fbuffer->event);
return fbuffer->entry; return fbuffer->entry;
} }
EXPORT_SYMBOL_GPL(ftrace_event_buffer_reserve); EXPORT_SYMBOL_GPL(trace_event_buffer_reserve);
static DEFINE_SPINLOCK(tracepoint_iter_lock); static DEFINE_SPINLOCK(tracepoint_iter_lock);
static void output_printk(struct ftrace_event_buffer *fbuffer) static void output_printk(struct trace_event_buffer *fbuffer)
{ {
struct trace_event_call *event_call; struct trace_event_call *event_call;
struct trace_event *event; struct trace_event *event;
@ -241,7 +241,7 @@ static void output_printk(struct ftrace_event_buffer *fbuffer)
spin_unlock_irqrestore(&tracepoint_iter_lock, flags); spin_unlock_irqrestore(&tracepoint_iter_lock, flags);
} }
void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer) void trace_event_buffer_commit(struct trace_event_buffer *fbuffer)
{ {
if (tracepoint_printk) if (tracepoint_printk)
output_printk(fbuffer); output_printk(fbuffer);
@ -250,7 +250,7 @@ void ftrace_event_buffer_commit(struct ftrace_event_buffer *fbuffer)
fbuffer->event, fbuffer->entry, fbuffer->event, fbuffer->entry,
fbuffer->flags, fbuffer->pc); fbuffer->flags, fbuffer->pc);
} }
EXPORT_SYMBOL_GPL(ftrace_event_buffer_commit); EXPORT_SYMBOL_GPL(trace_event_buffer_commit);
int trace_event_reg(struct trace_event_call *call, int trace_event_reg(struct trace_event_call *call,
enum trace_reg type, void *data) enum trace_reg type, void *data)