tracing fixes
Linus,
Please pull the latest tracing-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing-fixes-for-linus
Thanks,
Ingo
------------------>
Carsten Emde (1):
tracing: Remove comparing of NULL to va_list in trace_array_vprintk()
Jiri Olsa (1):
tracing: Fix function graph trace_pipe to properly display failed entries
Johannes Berg (1):
tracing: Add full state to trace_seq
Steven Rostedt (3):
tracing: Add pipe_close interface
tracing: Only call pipe_close if pipe_close is defined
tracing: Buffer the output of seq_file in case of filled buffer
include/linux/ftrace_event.h | 1 + include/linux/trace_seq.h | 7 +- kernel/trace/trace.c | 57 ++++++++++-- kernel/trace/trace.h | 2 + kernel/trace/trace_functions_graph.c | 165 +++++++++++++++++++++++++++------- kernel/trace/trace_output.c | 75 +++++++++++++--- 6 files changed, 248 insertions(+), 59 deletions(-)
include/linux/ftrace_event.h +1 -0
@@ -57,6 +57,7 @@ struct trace_iterator {/* The below is zeroed out in pipe_read */ struct trace_seq seq;struct trace_entry *ent; +int leftover;int cpu;u64 ts;
include/linux/trace_seq.h +5 -2
@@ -14,6 +14,7 @@ struct trace_seq {unsigned char buffer[PAGE_SIZE ];unsigned int len;unsigned int readpos; +int full; }; static inline void
@@ -21,6 +22,7 @@ trace_seq_init(struct trace_seq *s) { s->len =0 ; s->readpos =0 ; + s->full =0 ; }/*
@@ -33,7 +35,7 @@ extern int trace_seq_vprintf(struct trace_seq *s, const char *fmt, va_list args) __attribute__ ((format (printf, 2, 0)));extern int trace_seq_bprintf (struct trace_seq *s,const char *fmt,const u32 *binary); -extern void trace_print_seq (struct seq_file *m,struct trace_seq *s); +extern int trace_print_seq (struct seq_file *m,struct trace_seq *s);extern ssize_t trace_seq_to_user (struct trace_seq *s,char __user *ubuf,size_t cnt);extern int trace_seq_puts (struct trace_seq *s,const char *str);
@@ -55,8 +57,9 @@ trace_seq_bprintf(struct trace_seq *s, const char *fmt, const u32 *binary)return 0 ; } -static inline void trace_print_seq (struct seq_file *m,struct trace_seq *s) +static inline int trace_print_seq (struct seq_file *m,struct trace_seq *s) { +return 0 ; }static inline ssize_t trace_seq_to_user (struct trace_seq *s,char __user *ubuf,size_t cnt)
kernel/trace/trace.c +48 -9
107 lines not on this page · raw message
kernel/trace/trace.h +2 -0
@@ -272,6 +272,7 @@ struct tracer_flags {* @pipe_open: called when the trace_pipe file is opened * @wait_pipe: override how the user waits for traces on trace_pipe * @close: called when the trace file is released +* @pipe_close: called when the trace_pipe file is released * @read: override the default read callback on trace_pipe * @splice_read: override the default splice_read callback on trace_pipe * @selftest: selftest to run on boot (see trace_selftest.c)
@@ -290,6 +291,7 @@ struct tracer {void (*pipe_open)(struct trace_iterator *iter);void (*wait_pipe)(struct trace_iterator *iter);void (*close)(struct trace_iterator *iter); +void (*pipe_close)(struct trace_iterator *iter);ssize_t (*read)(struct trace_iterator *iter,struct file *filp,char __user *ubuf,size_t cnt,loff_t *ppos);
kernel/trace/trace_functions_graph.c +131 -34
266 lines not on this page · raw message
kernel/trace/trace_output.c +61 -14
177 lines not on this page · raw message