diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-05-13 15:40:23 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2015-05-13 21:49:01 -0400 |
commit | d0ee8f4a1f5f3df933cdc9a80f5dea13e2fb5022 (patch) | |
tree | dfe75df4f5f1df1ca78b3729d0faba9e0fbbb89e /include/trace | |
parent | 33d0f35eea7ac9027dee4fff819fc54afc8615e5 (diff) |
tracing: Rename ftrace_get_offsets_##call() to trace_event_get_offsets_##call()
The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The function ftrace_get_offsets_##call()
is used to find the offset into dynamically allocated trace event fields
for printing. It has nothing to do with function tracing. Rename it.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/perf.h | 6 | ||||
-rw-r--r-- | include/trace/trace_events.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/trace/perf.h b/include/trace/perf.h index 4ad27492a63d..1b5443cebedc 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h | |||
@@ -31,7 +31,7 @@ | |||
31 | * local_save_flags(irq_flags); | 31 | * local_save_flags(irq_flags); |
32 | * pc = preempt_count(); | 32 | * pc = preempt_count(); |
33 | * | 33 | * |
34 | * __data_size = ftrace_get_offsets_<call>(&__data_offsets, args); | 34 | * __data_size = trace_event_get_offsets_<call>(&__data_offsets, args); |
35 | * | 35 | * |
36 | * event = trace_event_buffer_lock_reserve(&buffer, trace_file, | 36 | * event = trace_event_buffer_lock_reserve(&buffer, trace_file, |
37 | * event_<call>->event.type, | 37 | * event_<call>->event.type, |
@@ -162,7 +162,7 @@ trace_event_raw_event_##call(void *__data, proto) \ | |||
162 | if (trace_trigger_soft_disabled(trace_file)) \ | 162 | if (trace_trigger_soft_disabled(trace_file)) \ |
163 | return; \ | 163 | return; \ |
164 | \ | 164 | \ |
165 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ | 165 | __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \ |
166 | \ | 166 | \ |
167 | entry = trace_event_buffer_reserve(&fbuffer, trace_file, \ | 167 | entry = trace_event_buffer_reserve(&fbuffer, trace_file, \ |
168 | sizeof(*entry) + __data_size); \ | 168 | sizeof(*entry) + __data_size); \ |
@@ -303,7 +303,7 @@ perf_trace_##call(void *__data, proto) \ | |||
303 | int __data_size; \ | 303 | int __data_size; \ |
304 | int rctx; \ | 304 | int rctx; \ |
305 | \ | 305 | \ |
306 | __data_size = ftrace_get_offsets_##call(&__data_offsets, args); \ | 306 | __data_size = trace_event_get_offsets_##call(&__data_offsets, args); \ |
307 | \ | 307 | \ |
308 | head = this_cpu_ptr(event_call->perf_events); \ | 308 | head = this_cpu_ptr(event_call->perf_events); \ |
309 | if (__builtin_constant_p(!__task) && !__task && \ | 309 | if (__builtin_constant_p(!__task) && !__task && \ |
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index e27b87ef5724..43be3b0e44d3 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h | |||
@@ -485,7 +485,7 @@ trace_event_define_fields_##call(struct trace_event_call *event_call) \ | |||
485 | 485 | ||
486 | #undef DECLARE_EVENT_CLASS | 486 | #undef DECLARE_EVENT_CLASS |
487 | #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ | 487 | #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ |
488 | static inline notrace int ftrace_get_offsets_##call( \ | 488 | static inline notrace int trace_event_get_offsets_##call( \ |
489 | struct trace_event_data_offsets_##call *__data_offsets, proto) \ | 489 | struct trace_event_data_offsets_##call *__data_offsets, proto) \ |
490 | { \ | 490 | { \ |
491 | int __data_size = 0; \ | 491 | int __data_size = 0; \ |