tracing: Rename ftrace_raw_##call event structures to trace_event_raw_##call

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The ftrace_raw_##call structures are built
by macros for trace events. They have nothing to do with function tracing.
Rename them.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/trace/perf.h b/include/trace/perf.h
index c9b831f3da23ad8e682fdcdc80696be1fea193da..c3fe3c859a1704495f959298069f4c5969e8c4fc 100644 (file)
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -7,7 +7,7 @@
  *
  * static struct trace_event_call event_<call>;
  *
- * static void ftrace_raw_event_<call>(void *__data, proto)
+ * static void trace_event_raw_event_<call>(void *__data, proto)
  * {
  *     struct trace_event_file *trace_file = __data;
  *     struct trace_event_call *event_call = trace_file->event_call;
@@ -15,7 +15,7 @@
  *     unsigned long eflags = trace_file->flags;
  *     enum event_trigger_type __tt = ETT_NONE;
  *     struct ring_buffer_event *event;
- *     struct ftrace_raw_<call> *entry; <-- defined in stage 1
+ *     struct trace_event_raw_<call> *entry; <-- defined in stage 1
  *     struct ring_buffer *buffer;
  *     unsigned long irq_flags;
  *     int __data_size;
@@ -68,7 +68,7 @@
  *     .define_fields          = ftrace_define_fields_<call>,
  *     .fields                 = LIST_HEAD_INIT(event_class_##call.fields),
  *     .raw_init               = trace_event_raw_init,
- *     .probe                  = ftrace_raw_event_##call,
+ *     .probe                  = trace_event_raw_event_##call,
  *     .reg                    = trace_event_reg,
  * };
  *
@@ -151,12 +151,12 @@
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
                                                                        \
 static notrace void                                                    \
-ftrace_raw_event_##call(void *__data, proto)                           \
+trace_event_raw_event_##call(void *__data, proto)                      \
 {                                                                      \
        struct trace_event_file *trace_file = __data;                   \
        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
        struct trace_event_buffer fbuffer;                              \
-       struct ftrace_raw_##call *entry;                                \
+       struct trace_event_raw_##call *entry;                           \
        int __data_size;                                                \
                                                                        \
        if (trace_trigger_soft_disabled(trace_file))                    \
@@ -186,7 +186,7 @@ ftrace_raw_event_##call(void *__data, proto)                                \
 #define DEFINE_EVENT(template, call, proto, args)                      \
 static inline void ftrace_test_probe_##call(void)                      \
 {                                                                      \
-       check_trace_callback_type_##call(ftrace_raw_event_##template);  \
+       check_trace_callback_type_##call(trace_event_raw_event_##template); \
 }
 
 #undef DEFINE_EVENT_PRINT
@@ -218,7 +218,7 @@ static struct trace_event_class __used __refdata event_class_##call = { \
        .define_fields          = ftrace_define_fields_##call,          \
        .fields                 = LIST_HEAD_INIT(event_class_##call.fields),\
        .raw_init               = trace_event_raw_init,                 \
-       .probe                  = ftrace_raw_event_##call,              \
+       .probe                  = trace_event_raw_event_##call,         \
        .reg                    = trace_event_reg,                      \
        _TRACE_PERF_INIT(call)                                          \
 };
@@ -294,7 +294,7 @@ perf_trace_##call(void *__data, proto)                                      \
 {                                                                      \
        struct trace_event_call *event_call = __data;                   \
        struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
-       struct ftrace_raw_##call *entry;                                \
+       struct trace_event_raw_##call *entry;                           \
        struct pt_regs *__regs;                                         \
        u64 __addr = 0, __count = 1;                                    \
        struct task_struct *__task = NULL;                              \

diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index ab927dd32149723de9115adb72792c5a827931bf..0e9519d5eacb908def70164f5fabbbd9e267259a 100644 (file)
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -3,7 +3,7 @@
  *
  * Override the macros in <trace/trace_events.h> to include the following:
  *
- * struct ftrace_raw_<call> {
+ * struct trace_event_raw_<call> {
  *     struct trace_entry              ent;
  *     <type>                          <item>;
  *     <type2>                         <item2>[<len>];
@@ -95,7 +95,7 @@ TRACE_MAKE_SYSTEM_STR();
 
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print) \
-       struct ftrace_raw_##name {                                      \
+       struct trace_event_raw_##name {                                 \
                struct trace_entry      ent;                            \
                tstruct                                                 \
                char                    __data[0];                      \
@@ -206,7 +206,7 @@ TRACE_MAKE_SYSTEM_STR();
  * 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
+ *     struct trace_event_raw_<call> *field; <-- defined in stage 1
  *     struct trace_entry *entry;
  *     struct trace_seq *p = &iter->tmp_seq;
  *     int ret;
@@ -309,7 +309,7 @@ trace_raw_output_##call(struct trace_iterator *iter, int flags,             \
 {                                                                      \
        struct trace_seq *s = &iter->seq;                               \
        struct trace_seq __maybe_unused *p = &iter->tmp_seq;            \
-       struct ftrace_raw_##call *field;                                \
+       struct trace_event_raw_##call *field;                           \
        int ret;                                                        \
                                                                        \
        field = (typeof(field))iter->ent;                               \
@@ -332,7 +332,7 @@ static notrace enum print_line_t                                    \
 trace_raw_output_##call(struct trace_iterator *iter, int flags,                \
                         struct trace_event *event)                     \
 {                                                                      \
-       struct ftrace_raw_##template *field;                            \
+       struct trace_event_raw_##template *field;                       \
        struct trace_entry *entry;                                      \
        struct trace_seq *p = &iter->tmp_seq;                           \
                                                                        \
@@ -409,7 +409,7 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = {      \
 static int notrace __init                                              \
 ftrace_define_fields_##call(struct trace_event_call *event_call)       \
 {                                                                      \
-       struct ftrace_raw_##call field;                                 \
+       struct trace_event_raw_##call field;                            \
        int ret;                                                        \
                                                                        \
        tstruct;                                                        \
@@ -490,7 +490,7 @@ static inline notrace int ftrace_get_offsets_##call(                        \
 {                                                                      \
        int __data_size = 0;                                            \
        int __maybe_unused __item_length;                               \
-       struct ftrace_raw_##call __maybe_unused *entry;                 \
+       struct trace_event_raw_##call __maybe_unused *entry;            \
                                                                        \
        tstruct;                                                        \
                                                                        \

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 319560a1af4bd98b44644e7d4d5043ca81c7eecd..71511ebc70db797540948eb4787bb5de7e1e931d 100644 (file)
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -2268,7 +2268,7 @@ out_unlock:
 
 static struct test_filter_data_t {
        char *filter;
-       struct ftrace_raw_ftrace_test_filter rec;
+       struct trace_event_raw_ftrace_test_filter rec;
        int match;
        char *not_visited;
 } test_filter_data[] = {

diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index bb2cff8abe7179163bfa0f813665bf1eea9cd6c3..42a4009fd75adadb4c110cfb0ef3824f9f935248 100644 (file)
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -968,7 +968,7 @@ static __init int register_trigger_snapshot_cmd(void) { return 0; }
  * Skip 3:
  *   stacktrace_trigger()
  *   event_triggers_post_call()
- *   ftrace_raw_event_xxx()
+ *   trace_event_raw_event_xxx()
  */
 #define STACK_SKIP 3