tracing: automate output for ftrace formats
Subsystems (3)
Steven Rostedt
maintainerIngo,
Currently, the output for the format files for the internal ftrace plugin entries is done by hand. This becomes difficult to maintain and error prone. If a change happens to a structure, it is likely that it will not be shown in the format file which binary readers of ftrace require.
This patch series implements the logic that is used by TRACE_EVENT to use macros that create the structures and those same macros also show the output layout in the format files. This guarantees that the structures and the output formats remain in-sync.
Again, this is based off of tip/tracing/core2
Please pull the latest tip/tracing/core3 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/core3
Steven Rostedt (6):
tracing: allow filter predicates to handle ksym symbols
tracing: use macros to create internal ftrace entry ring buffer structures
tracing: show details of structures within the ftrace structures
tracing: use the new trace_entries.h to create format files
tracing: remove trace_event_types.h
tracing: add filter event logic to special, mmiotrace and boot tracers
----
include/linux/ftrace_event.h | 4 +- kernel/trace/trace.c | 5 +- kernel/trace/trace.h | 175 ++++------------- kernel/trace/trace_boot.c | 8 +- kernel/trace/trace_entries.h | 392 ++++++++++++++++++++++++++++++++++++++ kernel/trace/trace_event_types.h | 178 ----------------- kernel/trace/trace_events.c | 1 + kernel/trace/trace_export.c | 241 +++++++++++++----------- kernel/trace/trace_mmiotrace.c | 10 +- 9 files changed, 581 insertions(+), 433 deletions(-)
Steven Rostedt
maintainerPATCH 1/6 tracing: allow filter predicates to handle ksym symbols
From: Steven Rostedt <[email protected]>
This patch increases the max string used by predicates to handle KSYM_SYMBOL_LEN.
Also moves an include to look nicer.
--- include/linux/ftrace_event.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
include/linux/ftrace_event.h +2 -2
@@ -1,8 +1,8 @@#ifndef _LINUX_FTRACE_EVENT_H#define _LINUX_FTRACE_EVENT_H -#include <linux/trace_seq.h> #include <linux/ring_buffer.h> +#include <linux/trace_seq.h> #include <linux/percpu.h> struct trace_array ;
@@ -135,7 +135,7 @@ struct ftrace_event_call { };#define MAX_FILTER_PRED 32 -#define MAX_FILTER_STR_VAL 128 +#define MAX_FILTER_STR_VAL 256/* Should handle KSYM_SYMBOL_LEN */ extern void destroy_preds (struct ftrace_event_call *call);extern int filter_match_preds (struct ftrace_event_call *call,void *rec);
Signature · 3 lines
1.6.3.3 --
Steven Rostedt
maintainerPATCH 2/6 tracing: use macros to create internal ftrace entry ring buffer structures
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
The entries used by ftrace internal code (plugins) currently have their formats manually exported to userspace. That is, the format files in debugfs/tracing/events/ftrace/*/format are currently created by hand. This is a maintenance nightmare, and can easily become out of sync with what is actually shown.
This patch uses the methodology of the TRACE_EVENT macros to build the structures so that their formats can be automated and this will keep the structures in sync with what users can see.
This patch only changes the way the structures are created. Further patches will build off of this to automate the format files.
--- kernel/trace/trace.h | 160 ++++---------------- kernel/trace/trace_entries.h | 342 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 369 insertions(+), 133 deletions(-) create mode 100644 kernel/trace/trace_entries.h
kernel/trace/trace.h +27 -133
@@ -42,150 +42,45 @@ enum trace_type { __TRACE_LAST_TYPE, }; -/* -* Function trace entry - function address and parent function addres: -*/ -struct ftrace_entry { -struct trace_entry ent; -unsigned long ip; -unsigned long parent_ip; -}; - -/* Function call entry */ -struct ftrace_graph_ent_entry { -struct trace_entry ent; -struct ftrace_graph_ent graph_ent; +enum kmemtrace_type_id { +KMEMTRACE_TYPE_KMALLOC =0 ,/* kmalloc() or kfree(). */ +KMEMTRACE_TYPE_CACHE ,/* kmem_cache_*(). */ +KMEMTRACE_TYPE_PAGES ,/* __get_free_pages() and friends. */ }; -/* Function return entry */ -struct ftrace_graph_ret_entry { -struct trace_entry ent; -struct ftrace_graph_ret ret; -};extern struct tracer boot_tracer; -/* -* Context switch trace entry - which task (and prio) we switched from/to: -*/ -struct ctx_switch_entry { -struct trace_entry ent; -unsigned int prev_pid; -unsigned char prev_prio; -unsigned char prev_state; -unsigned int next_pid; -unsigned char next_prio; -unsigned char next_state; -unsigned int next_cpu; -}; - -/* -* Special (free-form) trace entry: -*/ -struct special_entry { -struct trace_entry ent; -unsigned long arg1; -unsigned long arg2; -unsigned long arg3; -}; - -/* -* Stack-trace entry: -*/ +#undef __field +#define __field (type, item) type item; -#define FTRACE_STACK_ENTRIES 8 +#undef __array +#define __array (type, item, size) type item[size]; -struct stack_entry { -struct trace_entry ent; -unsigned long caller[FTRACE_STACK_ENTRIES ]; -}; +#undef __dynamic_array +#define __dynamic_array (type, item) type item[]; -struct userstack_entry { -struct trace_entry ent; -unsigned int tgid; -unsigned long caller[FTRACE_STACK_ENTRIES ]; -}; - -/* -* trace_printk entry: -*/ -struct bprint_entry { -struct trace_entry ent; -unsigned long ip; -const char *fmt; -u32 buf[]; -}; - -struct print_entry { -struct trace_entry ent; -unsigned long ip; -char buf[]; -}; +#undef F_STRUCT +#define F_STRUCT(args...) args -struct trace_mmiotrace_rw { -struct trace_entry ent; -struct mmiotrace_rw rw; -}; - -struct trace_mmiotrace_map { -struct trace_entry ent; -struct mmiotrace_map map; -}; - -struct trace_boot_call { -struct trace_entry ent; -struct boot_trace_call boot_call; -}; - -struct trace_boot_ret { -struct trace_entry ent; -struct boot_trace_ret boot_ret; -}; - -#define TRACE_FUNC_SIZE 30 -#define TRACE_FILE_SIZE 20 -struct trace_branch { -struct trace_entry ent; -unsigned line; -char func[TRACE_FUNC_SIZE +1 ]; -char file[TRACE_FILE_SIZE +1 ]; -char correct; -}; - -struct hw_branch_entry { -struct trace_entry ent; -u64 from; -u64 to; -}; - -struct trace_power { -struct trace_entry ent; -struct power_trace state_data; -}; +#undef FTRACE_ENTRY +#define FTRACE_ENTRY (name, struct_name, id, tstruct, print) \ + struct struct_name { \ + struct trace_entry ent; \ + tstruct \ + } -enum kmemtrace_type_id { -KMEMTRACE_TYPE_KMALLOC =0 ,/* kmalloc() or kfree(). */ -KMEMTRACE_TYPE_CACHE ,/* kmem_cache_*(). */ -KMEMTRACE_TYPE_PAGES ,/* __get_free_pages() and friends. */ -}; +#undef TP_ARGS +#define TP_ARGS(args...) args -struct kmemtrace_alloc_entry { -struct trace_entry ent; -enum kmemtrace_type_id type_id; -unsigned long call_site; -const void *ptr; -size_t bytes_req; -size_t bytes_alloc; -gfp_t gfp_flags; -int node; -}; +#undef FTRACE_ENTRY_DUP +#define FTRACE_ENTRY_DUP (name, name_struct, id, tstruct, printk) -struct kmemtrace_free_entry { -struct trace_entry ent; -enum kmemtrace_type_id type_id; -unsigned long call_site; -const void *ptr; -}; +#include "trace_entries.h" +/* +* syscalls are special, and need special handling, this is why +* they are not included in trace_entries.h +*/ struct syscall_trace_enter {struct trace_entry ent;int nr;
@@ -198,7 +93,6 @@ struct syscall_trace_exit {unsigned long ret; }; -/* * trace_flag_type is an enumeration that holds different * states when a trace occurs. These are:
kernel/trace/trace_entries.h new file +342 -0
342 lines not on this page · raw message
Signature · 3 lines
1.6.3.3 --
Steven Rostedt
maintainerPATCH 3/6 tracing: show details of structures within the ftrace structures
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Some of the internal ftrace structures use structures within. The output of a field saying it is just a structure is useless for a format file. A binary reader of the ring buffer needs to know more about how the fields are broken up.
This patch adds to the ftrace structure macros new fields to describe the structures inside a structure.
--- kernel/trace/trace.h | 9 ++++++ kernel/trace/trace_entries.h | 64 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 66 insertions(+), 7 deletions(-)
kernel/trace/trace.h +9 -0
@@ -53,9 +53,18 @@ extern struct tracer boot_tracer;#undef __field#define __field (type, item) type item; +#undef __field_struct +#define __field_struct (type, item) __field(type, item) + +#undef __field_desc +#define __field_desc (type, container, item) +#undef __array#define __array (type, item, size) type item[size]; +#undef __array_desc +#define __array_desc (type, container, item, size) +#undef __dynamic_array#define __dynamic_array (type, item) type item[];
kernel/trace/trace_entries.h +57 -7
112 lines not on this page · raw message
Signature · 3 lines
1.6.3.3 --
Steven Rostedt
maintainerPATCH 6/6 tracing: add filter event logic to special, mmiotrace and boot tracers
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Now that the pluging tracers use macros to create the structures and automate the exporting of their formats to the format files, they also automatically get a filter file.
This patch adds the code to implement the filter logic in the trace recordings.
--- kernel/trace/trace.c | 5 ++++- kernel/trace/trace_boot.c | 8 ++++++-- kernel/trace/trace_mmiotrace.c | 10 ++++++++-- 3 files changed, 18 insertions(+), 5 deletions(-)
kernel/trace/trace.c +4 -1
@@ -1206,6 +1206,7 @@ ftrace_trace_special(void *__tr, unsigned long arg1, unsigned long arg2, unsigned long arg3, int pc) { + struct ftrace_event_call *call = &event_special;struct ring_buffer_event *event;struct trace_array *tr = __tr;struct ring_buffer *buffer = tr->buffer;
@@ -1219,7 +1220,9 @@ ftrace_trace_special(void *__tr, entry->arg1 = arg1; entry->arg2 = arg2; entry->arg3 = arg3; -trace_buffer_unlock_commit (buffer, event,0 , pc); + +if (!filter_check_discard (call, entry, buffer, event)) +trace_buffer_unlock_commit (buffer, event,0 , pc); }void
kernel/trace/trace_boot.c +6 -2
@@ -129,6 +129,7 @@ struct tracer boot_tracer __read_mostly =void trace_boot_call (struct boot_trace_call *bt,initcall_t fn) { +struct ftrace_event_call *call = &event_boot_call;struct ring_buffer_event *event;struct ring_buffer *buffer;struct trace_boot_call *entry;
@@ -150,13 +151,15 @@ void trace_boot_call(struct boot_trace_call *bt, initcall_t fn) goto out; entry =ring_buffer_event_data (event); entry->boot_call = *bt; -trace_buffer_unlock_commit (buffer, event,0 ,0 ); +if (!filter_check_discard (call, entry, buffer, event)) +trace_buffer_unlock_commit (buffer, event,0 ,0 ); out:preempt_enable (); }void trace_boot_ret (struct boot_trace_ret *bt,initcall_t fn) { +struct ftrace_event_call *call = &event_boot_ret;struct ring_buffer_event *event;struct ring_buffer *buffer;struct trace_boot_ret *entry;
@@ -175,7 +178,8 @@ void trace_boot_ret(struct boot_trace_ret *bt, initcall_t fn) goto out; entry =ring_buffer_event_data (event); entry->boot_ret = *bt; -trace_buffer_unlock_commit (buffer, event,0 ,0 ); +if (!filter_check_discard (call, entry, buffer, event)) +trace_buffer_unlock_commit (buffer, event,0 ,0 ); out:preempt_enable (); }
kernel/trace/trace_mmiotrace.c +8 -2
@@ -307,6 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,struct trace_array_cpu *data, struct mmiotrace_rw *rw) { + struct ftrace_event_call *call = &event_mmiotrace_rw;struct ring_buffer *buffer = tr->buffer;struct ring_buffer_event *event;struct trace_mmiotrace_rw *entry;
@@ -320,7 +321,9 @@ static void __trace_mmiotrace_rw(struct trace_array *tr, } entry =ring_buffer_event_data (event); entry->rw = *rw; -trace_buffer_unlock_commit (buffer, event,0 , pc); + +if (!filter_check_discard (call, entry, buffer, event)) +trace_buffer_unlock_commit (buffer, event,0 , pc); }void mmio_trace_rw (struct mmiotrace_rw *rw)
@@ -334,6 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,struct trace_array_cpu *data, struct mmiotrace_map *map) { + struct ftrace_event_call *call = &event_mmiotrace_map;struct ring_buffer *buffer = tr->buffer;struct ring_buffer_event *event;struct trace_mmiotrace_map *entry;
@@ -347,7 +351,9 @@ static void __trace_mmiotrace_map(struct trace_array *tr, } entry =ring_buffer_event_data (event); entry->map = *map; -trace_buffer_unlock_commit (buffer, event,0 , pc); + +if (!filter_check_discard (call, entry, buffer, event)) +trace_buffer_unlock_commit (buffer, event,0 , pc); }void mmio_trace_mapping (struct mmiotrace_map *map)
Signature · 3 lines
1.6.3.3 --
Steven Rostedt
maintainerPATCH 5/6 tracing: remove trace_event_types.h
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
The macros in trace_entries.h have made the code in trace_event_types.h obsolete. The file is no longer used, so this patch removes it.
--- kernel/trace/trace_event_types.h | 178 -------------------------------------- 1 files changed, 0 insertions(+), 178 deletions(-) delete mode 100644 kernel/trace/trace_event_types.h
kernel/trace/trace_event_types.h deleted +0 -178
@@ -1,178 +0,0 @@ -#undef TRACE_SYSTEM -#define TRACE_SYSTEM ftrace - -/* -* We cheat and use the proto type field as the ID -* and args as the entry type (minus 'struct') -*/ -TRACE_EVENT_FORMAT (function,TRACE_FN , ftrace_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, ip, ip) - TRACE_FIELD(unsigned long, parent_ip, parent_ip) - ), -TP_RAW_FMT (" %lx <-- %lx" ) -); - -TRACE_EVENT_FORMAT (funcgraph_entry,TRACE_GRAPH_ENT , - ftrace_graph_ent_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, graph_ent.func, func) -TRACE_FIELD (int, graph_ent.depth, depth) - ), -TP_RAW_FMT ("--> %lx (%d)" ) -); - -TRACE_EVENT_FORMAT (funcgraph_exit,TRACE_GRAPH_RET , - ftrace_graph_ret_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, ret.func, func) - TRACE_FIELD(unsigned long long, ret.calltime, calltime) - TRACE_FIELD(unsigned long long, ret.rettime, rettime) - TRACE_FIELD(unsigned long, ret.overrun, overrun) -TRACE_FIELD (int, ret.depth, depth) - ), -TP_RAW_FMT ("<-- %lx (%d)" ) -); - -TRACE_EVENT_FORMAT (wakeup,TRACE_WAKE , ctx_switch_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned int, prev_pid, prev_pid) - TRACE_FIELD(unsigned char, prev_prio, prev_prio) - TRACE_FIELD(unsigned char, prev_state, prev_state) - TRACE_FIELD(unsigned int, next_pid, next_pid) - TRACE_FIELD(unsigned char, next_prio, next_prio) - TRACE_FIELD(unsigned char, next_state, next_state) - TRACE_FIELD(unsigned int, next_cpu, next_cpu) - ), -TP_RAW_FMT ("%u:%u:%u ==+ %u:%u:%u [%03u]" ) -); - -TRACE_EVENT_FORMAT (context_switch,TRACE_CTX , ctx_switch_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned int, prev_pid, prev_pid) - TRACE_FIELD(unsigned char, prev_prio, prev_prio) - TRACE_FIELD(unsigned char, prev_state, prev_state) - TRACE_FIELD(unsigned int, next_pid, next_pid) - TRACE_FIELD(unsigned char, next_prio, next_prio) - TRACE_FIELD(unsigned char, next_state, next_state) - TRACE_FIELD(unsigned int, next_cpu, next_cpu) - ), -TP_RAW_FMT ("%u:%u:%u ==+ %u:%u:%u [%03u]" ) -); - -TRACE_EVENT_FORMAT_NOFILTER (special,TRACE_SPECIAL , special_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, arg1, arg1) - TRACE_FIELD(unsigned long, arg2, arg2) - TRACE_FIELD(unsigned long, arg3, arg3) - ), -TP_RAW_FMT ("(%08lx) (%08lx) (%08lx)" ) -); - -/* -* Stack-trace entry: -*/ - -/* #define FTRACE_STACK_ENTRIES 8 */ - -TRACE_EVENT_FORMAT (kernel_stack,TRACE_STACK , stack_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, caller[0], stack0) - TRACE_FIELD(unsigned long, caller[1], stack1) - TRACE_FIELD(unsigned long, caller[2], stack2) - TRACE_FIELD(unsigned long, caller[3], stack3) - TRACE_FIELD(unsigned long, caller[4], stack4) - TRACE_FIELD(unsigned long, caller[5], stack5) - TRACE_FIELD(unsigned long, caller[6], stack6) - TRACE_FIELD(unsigned long, caller[7], stack7) - ), -TP_RAW_FMT ("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n" -"\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n" ) -); - -TRACE_EVENT_FORMAT (user_stack,TRACE_USER_STACK , userstack_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, caller[0], stack0) - TRACE_FIELD(unsigned long, caller[1], stack1) - TRACE_FIELD(unsigned long, caller[2], stack2) - TRACE_FIELD(unsigned long, caller[3], stack3) - TRACE_FIELD(unsigned long, caller[4], stack4) - TRACE_FIELD(unsigned long, caller[5], stack5) - TRACE_FIELD(unsigned long, caller[6], stack6) - TRACE_FIELD(unsigned long, caller[7], stack7) - ), -TP_RAW_FMT ("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n" -"\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n" ) -); - -TRACE_EVENT_FORMAT (bprint,TRACE_BPRINT , bprint_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, ip, ip) - TRACE_FIELD(char *, fmt, fmt) -TRACE_FIELD_ZERO_CHAR (buf) - ), -TP_RAW_FMT ("%08lx (%d) fmt:%p %s" ) -); - -TRACE_EVENT_FORMAT (print,TRACE_PRINT , print_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned long, ip, ip) -TRACE_FIELD_ZERO_CHAR (buf) - ), -TP_RAW_FMT ("%08lx (%d) fmt:%p %s" ) -); - -TRACE_EVENT_FORMAT (branch,TRACE_BRANCH , trace_branch, ignore, -TRACE_STRUCT ( - TRACE_FIELD(unsigned int, line, line) - TRACE_FIELD_SPECIAL(char func[TRACE_FUNC_SIZE+1], func, - TRACE_FUNC_SIZE+1, func) - TRACE_FIELD_SPECIAL(char file[TRACE_FUNC_SIZE+1], file, - TRACE_FUNC_SIZE+1, file) -TRACE_FIELD (char, correct, correct) - ), -TP_RAW_FMT ("%u:%s:%s (%u)" ) -); - -TRACE_EVENT_FORMAT (hw_branch,TRACE_HW_BRANCHES , hw_branch_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(u64, from, from) -TRACE_FIELD (u64, to, to) - ), -TP_RAW_FMT ("from: %llx to: %llx" ) -); - -TRACE_EVENT_FORMAT (power,TRACE_POWER , trace_power, ignore, -TRACE_STRUCT ( - TRACE_FIELD_SIGN(ktime_t, state_data.stamp, stamp, 1) - TRACE_FIELD_SIGN(ktime_t, state_data.end, end, 1) - TRACE_FIELD(int, state_data.type, type) -TRACE_FIELD (int, state_data.state, state) - ), -TP_RAW_FMT ("%llx->%llx type:%u state:%u" ) -); - -TRACE_EVENT_FORMAT (kmem_alloc,TRACE_KMEM_ALLOC , kmemtrace_alloc_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(enum kmemtrace_type_id, type_id, type_id) - TRACE_FIELD(unsigned long, call_site, call_site) - TRACE_FIELD(const void *, ptr, ptr) - TRACE_FIELD(size_t, bytes_req, bytes_req) - TRACE_FIELD(size_t, bytes_alloc, bytes_alloc) - TRACE_FIELD(gfp_t, gfp_flags, gfp_flags) -TRACE_FIELD (int, node, node) - ), -TP_RAW_FMT ("type:%u call_site:%lx ptr:%p req:%lu alloc:%lu" -" flags:%x node:%d" ) -); - -TRACE_EVENT_FORMAT (kmem_free,TRACE_KMEM_FREE , kmemtrace_free_entry, ignore, -TRACE_STRUCT ( - TRACE_FIELD(enum kmemtrace_type_id, type_id, type_id) - TRACE_FIELD(unsigned long, call_site, call_site) - TRACE_FIELD(const void *, ptr, ptr) - ), -TP_RAW_FMT ("type:%u call_site:%lx ptr:%p" ) -); - -#undef TRACE_SYSTEM
Signature · 3 lines
1.6.3.3 --
Steven Rostedt
maintainerPATCH 4/6 tracing: use the new trace_entries.h to create format files
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
This patch changes the way the format files in
debugfs/tracing/events/ftrace/*/format
are created. It uses the new trace_entries.h file to automate the creation of the format files to ensure that they are always in sync with the actual structures. This is the same methodology used to create the format files for the TRACE_EVENT macro.
This also updates the filter creation that was built on the creation of the format files.
--- kernel/trace/trace.h | 12 ++- kernel/trace/trace_events.c | 1 + kernel/trace/trace_export.c | 241 +++++++++++++++++++++++-------------------- 3 files changed, 136 insertions(+), 118 deletions(-)
kernel/trace/trace.h +7 -5
@@ -7,6 +7,7 @@#include <linux/clocksource.h> #include <linux/ring_buffer.h> #include <linux/mmiotrace.h> +#include <linux/tracepoint.h> #include <linux/ftrace.h> #include <trace/boot.h> #include <linux/kmemtrace.h>
@@ -746,11 +747,12 @@ extern struct list_head ftrace_events;extern const char *__start___trace_bprintk_fmt[];extern const char *__stop___trace_bprintk_fmt[]; -#undef TRACE_EVENT_FORMAT -#define TRACE_EVENT_FORMAT (call, proto, args, fmt, tstruct, tpfmt) \ +#undef FTRACE_ENTRY +#define FTRACE_ENTRY (call, struct_name, id, tstruct, print) \ extern struct ftrace_event_call event_##call; -#undef TRACE_EVENT_FORMAT_NOFILTER -#define TRACE_EVENT_FORMAT_NOFILTER (call, proto, args, fmt, tstruct, tpfmt) -#include "trace_event_types.h" +#undef FTRACE_ENTRY_DUP +#define FTRACE_ENTRY_DUP (call, struct_name, id, tstruct, print) \ + FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print)) +#include "trace_entries.h" #endif /* _LINUX_KERNEL_TRACE_H */
kernel/trace/trace_events.c +1 -0
@@ -21,6 +21,7 @@#include "trace_output.h" +#undef TRACE_SYSTEM#define TRACE_SYSTEM "TRACE_SYSTEM"DEFINE_MUTEX (event_mutex);
kernel/trace/trace_export.c +128 -113
295 lines not on this page · raw message
Signature · 3 lines
1.6.3.3 --
Quoted 13 lines · Steven Rostedt
Ingo,
Currently, the output for the format files for the internal ftrace plugin entries is done by hand. This becomes difficult to maintain and error prone. If a change happens to a structure, it is likely that it will not be shown in the format file which binary readers of ftrace require.
This patch series implements the logic that is used by
TRACE_EVENTto use macros that create the structures and those same macros also show the output layout in the format files. This guarantees that the structures and the output formats remain in-sync.
Quoted 6 lines
Again, this is based off of tip/tracing/core2
Please pull the latest tip/tracing/core3 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/core3
Pulled, thanks a lot Steve!
Ingo