diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-05-05 14:18:11 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-05-13 14:06:41 -0400 |
| commit | 892c505aac2bdded3c8ec2ec27abc6d74fd210f5 (patch) | |
| tree | 10fe9d8fa127bd84f4829103f31c3693c03fe3ab /include/trace | |
| parent | 3f795dcfc7364cd811c3f6f03d115fcefbbdc1ca (diff) | |
| download | linux-stable-892c505aac2bdded3c8ec2ec27abc6d74fd210f5.tar.gz linux-stable-892c505aac2bdded3c8ec2ec27abc6d74fd210f5.tar.bz2 linux-stable-892c505aac2bdded3c8ec2ec27abc6d74fd210f5.zip | |
tracing: Rename ftrace_output functions to trace_output
The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_output_*() and ftrace_raw_output_*()
functions represent the trace_event code. Rename them to just trace_output
or trace_raw_output.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/perf.h | 2 | ||||
| -rw-r--r-- | include/trace/trace_events.h | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/trace/perf.h b/include/trace/perf.h index b1d7399df449..0dbdbfe0ec41 100644 --- a/include/trace/perf.h +++ b/include/trace/perf.h @@ -58,7 +58,7 @@ * } * * static struct trace_event ftrace_event_type_<call> = { - * .trace = ftrace_raw_output_<call>, <-- stage 2 + * .trace = trace_raw_output_<call>, <-- stage 2 * }; * * static char print_fmt_<call>[] = <TP_printk>; diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h index c6f826136b8c..ab927dd32149 100644 --- a/include/trace/trace_events.h +++ b/include/trace/trace_events.h @@ -203,7 +203,7 @@ TRACE_MAKE_SYSTEM_STR(); * Override the macros in <trace/trace_events.h> to include the following: * * enum print_line_t - * ftrace_raw_output_<call>(struct trace_iterator *iter, int flags) + * trace_raw_output_<call>(struct trace_iterator *iter, int flags) * { * struct trace_seq *s = &iter->seq; * struct ftrace_raw_<call> *field; <-- defined in stage 1 @@ -304,8 +304,8 @@ TRACE_MAKE_SYSTEM_STR(); #undef DECLARE_EVENT_CLASS #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ static notrace enum print_line_t \ -ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ - struct trace_event *trace_event) \ +trace_raw_output_##call(struct trace_iterator *iter, int flags, \ + struct trace_event *trace_event) \ { \ struct trace_seq *s = &iter->seq; \ struct trace_seq __maybe_unused *p = &iter->tmp_seq; \ @@ -314,7 +314,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ \ field = (typeof(field))iter->ent; \ \ - ret = ftrace_raw_output_prep(iter, trace_event); \ + ret = trace_raw_output_prep(iter, trace_event); \ if (ret != TRACE_TYPE_HANDLED) \ return ret; \ \ @@ -323,13 +323,13 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ return trace_handle_return(s); \ } \ static struct trace_event_functions ftrace_event_type_funcs_##call = { \ - .trace = ftrace_raw_output_##call, \ + .trace = trace_raw_output_##call, \ }; #undef DEFINE_EVENT_PRINT #define DEFINE_EVENT_PRINT(template, call, proto, args, print) \ static notrace enum print_line_t \ -ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ +trace_raw_output_##call(struct trace_iterator *iter, int flags, \ struct trace_event *event) \ { \ struct ftrace_raw_##template *field; \ @@ -346,10 +346,10 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags, \ field = (typeof(field))entry; \ \ trace_seq_init(p); \ - return ftrace_output_call(iter, #call, print); \ + return trace_output_call(iter, #call, print); \ } \ static struct trace_event_functions ftrace_event_type_funcs_##call = { \ - .trace = ftrace_raw_output_##call, \ + .trace = trace_raw_output_##call, \ }; #include TRACE_INCLUDE(TRACE_INCLUDE_FILE) |