aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2015-05-13 15:27:47 -0400
committerSteven Rostedt <rostedt@goodmis.org>2015-05-13 21:48:40 -0400
commita7237765730a10d429736f47ac4b89779ec6c534 (patch)
treebd2c5a88bc120170bfa2a775c6c5dd48d1eae370 /include/trace
parent09a5059aa1a2cbf8c8993e61b013cc83a0dd5833 (diff)
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>
Diffstat (limited to 'include/trace')
-rw-r--r--include/trace/perf.h16
-rw-r--r--include/trace/trace_events.h14
2 files changed, 15 insertions, 15 deletions
diff --git a/include/trace/perf.h b/include/trace/perf.h
index c9b831f3da23..c3fe3c859a17 100644
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -7,7 +7,7 @@
7 * 7 *
8 * static struct trace_event_call event_<call>; 8 * static struct trace_event_call event_<call>;
9 * 9 *
10 * static void ftrace_raw_event_<call>(void *__data, proto) 10 * static void trace_event_raw_event_<call>(void *__data, proto)
11 * { 11 * {
12 * struct trace_event_file *trace_file = __data; 12 * struct trace_event_file *trace_file = __data;
13 * struct trace_event_call *event_call = trace_file->event_call; 13 * struct trace_event_call *event_call = trace_file->event_call;
@@ -15,7 +15,7 @@
15 * unsigned long eflags = trace_file->flags; 15 * unsigned long eflags = trace_file->flags;
16 * enum event_trigger_type __tt = ETT_NONE; 16 * enum event_trigger_type __tt = ETT_NONE;
17 * struct ring_buffer_event *event; 17 * struct ring_buffer_event *event;
18 * struct ftrace_raw_<call> *entry; <-- defined in stage 1 18 * struct trace_event_raw_<call> *entry; <-- defined in stage 1
19 * struct ring_buffer *buffer; 19 * struct ring_buffer *buffer;
20 * unsigned long irq_flags; 20 * unsigned long irq_flags;
21 * int __data_size; 21 * int __data_size;
@@ -68,7 +68,7 @@
68 * .define_fields = ftrace_define_fields_<call>, 68 * .define_fields = ftrace_define_fields_<call>,
69 * .fields = LIST_HEAD_INIT(event_class_##call.fields), 69 * .fields = LIST_HEAD_INIT(event_class_##call.fields),
70 * .raw_init = trace_event_raw_init, 70 * .raw_init = trace_event_raw_init,
71 * .probe = ftrace_raw_event_##call, 71 * .probe = trace_event_raw_event_##call,
72 * .reg = trace_event_reg, 72 * .reg = trace_event_reg,
73 * }; 73 * };
74 * 74 *
@@ -151,12 +151,12 @@
151#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \ 151#define DECLARE_EVENT_CLASS(call, proto, args, tstruct, assign, print) \
152 \ 152 \
153static notrace void \ 153static notrace void \
154ftrace_raw_event_##call(void *__data, proto) \ 154trace_event_raw_event_##call(void *__data, proto) \
155{ \ 155{ \
156 struct trace_event_file *trace_file = __data; \ 156 struct trace_event_file *trace_file = __data; \
157 struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ 157 struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
158 struct trace_event_buffer fbuffer; \ 158 struct trace_event_buffer fbuffer; \
159 struct ftrace_raw_##call *entry; \ 159 struct trace_event_raw_##call *entry; \
160 int __data_size; \ 160 int __data_size; \
161 \ 161 \
162 if (trace_trigger_soft_disabled(trace_file)) \ 162 if (trace_trigger_soft_disabled(trace_file)) \
@@ -186,7 +186,7 @@ ftrace_raw_event_##call(void *__data, proto) \
186#define DEFINE_EVENT(template, call, proto, args) \ 186#define DEFINE_EVENT(template, call, proto, args) \
187static inline void ftrace_test_probe_##call(void) \ 187static inline void ftrace_test_probe_##call(void) \
188{ \ 188{ \
189 check_trace_callback_type_##call(ftrace_raw_event_##template); \ 189 check_trace_callback_type_##call(trace_event_raw_event_##template); \
190} 190}
191 191
192#undef DEFINE_EVENT_PRINT 192#undef DEFINE_EVENT_PRINT
@@ -218,7 +218,7 @@ static struct trace_event_class __used __refdata event_class_##call = { \
218 .define_fields = ftrace_define_fields_##call, \ 218 .define_fields = ftrace_define_fields_##call, \
219 .fields = LIST_HEAD_INIT(event_class_##call.fields),\ 219 .fields = LIST_HEAD_INIT(event_class_##call.fields),\
220 .raw_init = trace_event_raw_init, \ 220 .raw_init = trace_event_raw_init, \
221 .probe = ftrace_raw_event_##call, \ 221 .probe = trace_event_raw_event_##call, \
222 .reg = trace_event_reg, \ 222 .reg = trace_event_reg, \
223 _TRACE_PERF_INIT(call) \ 223 _TRACE_PERF_INIT(call) \
224}; 224};
@@ -294,7 +294,7 @@ perf_trace_##call(void *__data, proto) \
294{ \ 294{ \
295 struct trace_event_call *event_call = __data; \ 295 struct trace_event_call *event_call = __data; \
296 struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\ 296 struct ftrace_data_offsets_##call __maybe_unused __data_offsets;\
297 struct ftrace_raw_##call *entry; \ 297 struct trace_event_raw_##call *entry; \
298 struct pt_regs *__regs; \ 298 struct pt_regs *__regs; \
299 u64 __addr = 0, __count = 1; \ 299 u64 __addr = 0, __count = 1; \
300 struct task_struct *__task = NULL; \ 300 struct task_struct *__task = NULL; \
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index ab927dd32149..0e9519d5eacb 100644
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Override the macros in <trace/trace_events.h> to include the following: 4 * Override the macros in <trace/trace_events.h> to include the following:
5 * 5 *
6 * struct ftrace_raw_<call> { 6 * struct trace_event_raw_<call> {
7 * struct trace_entry ent; 7 * struct trace_entry ent;
8 * <type> <item>; 8 * <type> <item>;
9 * <type2> <item2>[<len>]; 9 * <type2> <item2>[<len>];
@@ -95,7 +95,7 @@ TRACE_MAKE_SYSTEM_STR();
95 95
96#undef DECLARE_EVENT_CLASS 96#undef DECLARE_EVENT_CLASS
97#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print) \ 97#define DECLARE_EVENT_CLASS(name, proto, args, tstruct, assign, print) \
98 struct ftrace_raw_##name { \ 98 struct trace_event_raw_##name { \
99 struct trace_entry ent; \ 99 struct trace_entry ent; \
100 tstruct \ 100 tstruct \
101 char __data[0]; \ 101 char __data[0]; \
@@ -206,7 +206,7 @@ TRACE_MAKE_SYSTEM_STR();
206 * trace_raw_output_<call>(struct trace_iterator *iter, int flags) 206 * trace_raw_output_<call>(struct trace_iterator *iter, int flags)
207 * { 207 * {
208 * struct trace_seq *s = &iter->seq; 208 * struct trace_seq *s = &iter->seq;
209 * struct ftrace_raw_<call> *field; <-- defined in stage 1 209 * struct trace_event_raw_<call> *field; <-- defined in stage 1
210 * struct trace_entry *entry; 210 * struct trace_entry *entry;
211 * struct trace_seq *p = &iter->tmp_seq; 211 * struct trace_seq *p = &iter->tmp_seq;
212 * int ret; 212 * int ret;
@@ -309,7 +309,7 @@ trace_raw_output_##call(struct trace_iterator *iter, int flags, \
309{ \ 309{ \
310 struct trace_seq *s = &iter->seq; \ 310 struct trace_seq *s = &iter->seq; \
311 struct trace_seq __maybe_unused *p = &iter->tmp_seq; \ 311 struct trace_seq __maybe_unused *p = &iter->tmp_seq; \
312 struct ftrace_raw_##call *field; \ 312 struct trace_event_raw_##call *field; \
313 int ret; \ 313 int ret; \
314 \ 314 \
315 field = (typeof(field))iter->ent; \ 315 field = (typeof(field))iter->ent; \
@@ -332,7 +332,7 @@ static notrace enum print_line_t \
332trace_raw_output_##call(struct trace_iterator *iter, int flags, \ 332trace_raw_output_##call(struct trace_iterator *iter, int flags, \
333 struct trace_event *event) \ 333 struct trace_event *event) \
334{ \ 334{ \
335 struct ftrace_raw_##template *field; \ 335 struct trace_event_raw_##template *field; \
336 struct trace_entry *entry; \ 336 struct trace_entry *entry; \
337 struct trace_seq *p = &iter->tmp_seq; \ 337 struct trace_seq *p = &iter->tmp_seq; \
338 \ 338 \
@@ -409,7 +409,7 @@ static struct trace_event_functions ftrace_event_type_funcs_##call = { \
409static int notrace __init \ 409static int notrace __init \
410ftrace_define_fields_##call(struct trace_event_call *event_call) \ 410ftrace_define_fields_##call(struct trace_event_call *event_call) \
411{ \ 411{ \
412 struct ftrace_raw_##call field; \ 412 struct trace_event_raw_##call field; \
413 int ret; \ 413 int ret; \
414 \ 414 \
415 tstruct; \ 415 tstruct; \
@@ -490,7 +490,7 @@ static inline notrace int ftrace_get_offsets_##call( \
490{ \ 490{ \
491 int __data_size = 0; \ 491 int __data_size = 0; \
492 int __maybe_unused __item_length; \ 492 int __maybe_unused __item_length; \
493 struct ftrace_raw_##call __maybe_unused *entry; \ 493 struct trace_event_raw_##call __maybe_unused *entry; \
494 \ 494 \
495 tstruct; \ 495 tstruct; \
496 \ 496 \
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-01 11:52:57 -0400