tracing/ftrace: separate events tracing and stats tracing engine
PATCH 1/2 tracing/ftrace: separate events tracing and stats tracing engine
Impact: tracing's Api change
Currently, the stat tracing depends on the events tracing. When you switch to a new tracer, the stats files of the previous tracer will disappear. But it's more scalable to separate those two engines. This way, we can keep the stat files of one or several tracers when we want, without bothering of multiple tracer stat files or tracer switching.
To build/destroys its stats files, a tracer just have to call register_stat_tracer/unregister_stat_tracer everytimes it wants to.
Signed-off-by Frederic Weisbecker <[email protected]>
--- kernel/trace/trace.c | 2 - kernel/trace/trace.h | 20 ----- kernel/trace/trace_branch.c | 108 ++++++++++++++----------- kernel/trace/trace_stat.c | 191 ++++++++++++++++++------------------------- kernel/trace/trace_stat.h | 31 +++++++ 5 files changed, 172 insertions(+), 180 deletions(-)
kernel/trace/trace.c +0 -2
@@ -2353,7 +2353,6 @@ static int tracing_set_tracer(char *buf)if (ret) goto out; } -init_tracer_stat (t);trace_branch_enable (tr); out:
@@ -3218,7 +3217,6 @@ __init static int tracer_alloc_buffers(void)#else current_trace = &nop_trace;#endif -init_tracer_stat (current_trace);/* All seems OK, enable tracing */ tracing_disabled =0 ;
kernel/trace/trace.h +0 -20
@@ -334,24 +334,6 @@ struct tracer_flags {/* Makes more easy to define a tracer opt */ #define TRACER_OPT (s, b) .name = #s, .bit = b -/* -* If you want to provide a stat file (one-shot statistics), fill -* an iterator with stat_start/stat_next and a stat_show callbacks. -* The others callbacks are optional. -*/ -struct tracer_stat { -/* The name of your stat file */ -const char *name; -/* Iteration over statistic entries */ -void *(*stat_start)(void ); -void *(*stat_next)(void *prev,int idx); -/* Compare two entries for sorting (optional) for stats */ -int (*stat_cmp)(void *p1,void *p2); -/* Print a stat entry */ -int (*stat_show)(struct seq_file *s,void *p); -/* Print the headers of your stat entries */ -int (*stat_headers)(struct seq_file *s); -};/* * A specific tracer, represented by methods that operate on a trace array:
@@ -466,8 +448,6 @@ void tracing_start_sched_switch_record(void);int register_tracer (struct tracer *type);void unregister_tracer (struct tracer *type); -void init_tracer_stat (struct tracer *trace); -extern unsigned long nsecs_to_usecs (unsigned long nsecs);extern unsigned long tracing_max_latency;
kernel/trace/trace_branch.c +60 -48
144 lines not on this page · raw message
kernel/trace/trace_stat.c +81 -110
242 lines not on this page · raw message
kernel/trace/trace_stat.h new file +31 -0
@@ -0,0 +1,31 @@ +#ifndef __TRACE_STAT_H +#define __TRACE_STAT_H + +#include <linux/seq_file.h> + +/* +* If you want to provide a stat file (one-shot statistics), fill +* an iterator with stat_start/stat_next and a stat_show callbacks. +* The others callbacks are optional. +*/ +struct tracer_stat { +/* The name of your stat file */ +const char *name; +/* Iteration over statistic entries */ +void *(*stat_start)(void ); +void *(*stat_next)(void *prev,int idx); +/* Compare two entries for stats sorting */ +int (*stat_cmp)(void *p1,void *p2); +/* Print a stat entry */ +int (*stat_show)(struct seq_file *s,void *p); +/* Print the headers of your stat entries */ +int (*stat_headers)(struct seq_file *s); +}; + +/* +* Destroy or create a stat file +*/ +extern int register_stat_tracer (struct tracer_stat *trace); +extern void unregister_stat_tracer (struct tracer_stat *trace); + +#endif /* __TRACE_STAT_H */
Signature · 1 line
1.6.0.4