redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

x86, ftrace: call trace->open() before stopping tracing; add trace->print_header()

Browse source 
Add a callback to allow an ftrace plug-in to write its own header.

Move the call to trace->open() up a few lines.

The changes are required by the BTS ftrace plug-in.

Signed-off-by: Markus Metzger <markus.t.metzger@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Markus Metzger 2008-11-25 09:12:31 +01:00 committed by Ingo Molnar
parent 6abb11aecd
commit 8bba1bf5e2
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/trace/trace.c
View file

@ -2298,7 +2298,9 @@ static int s_show(struct seq_file *m, void *v)
seq_printf(m, "# tracer: %s\n", iter->trace->name); seq_printf(m, "# tracer: %s\n", iter->trace->name);
seq_puts(m, "#\n"); seq_puts(m, "#\n");
} }
if (iter->iter_flags & TRACE_FILE_LAT_FMT) { if (iter->trace && iter->trace->print_header)
iter->trace->print_header(m);
else if (iter->iter_flags & TRACE_FILE_LAT_FMT) {
/* print nothing if the buffers are empty */ /* print nothing if the buffers are empty */
if (trace_empty(iter)) if (trace_empty(iter))
return 0; return 0;
@ -2350,6 +2352,10 @@ __tracing_open(struct inode *inode, struct file *file, int *ret)
iter->trace = current_trace; iter->trace = current_trace;
iter->pos = -1; iter->pos = -1;
/* Notify the tracer early; before we stop tracing. */
if (iter->trace && iter->trace->open)
iter->trace->open(iter);
/* Annotate start of buffers if we had overruns */ /* Annotate start of buffers if we had overruns */
if (ring_buffer_overruns(iter->tr->buffer)) if (ring_buffer_overruns(iter->tr->buffer))
iter->iter_flags |= TRACE_FILE_ANNOTATE; iter->iter_flags |= TRACE_FILE_ANNOTATE;
@ -2375,9 +2381,6 @@ __tracing_open(struct inode *inode, struct file *file, int *ret)
/* stop the trace while dumping */ /* stop the trace while dumping */
tracing_stop(); tracing_stop();
if (iter->trace && iter->trace->open)
iter->trace->open(iter);
mutex_unlock(&trace_types_lock); mutex_unlock(&trace_types_lock);
out: out:

1
kernel/trace/trace.h
View file

@ -311,6 +311,7 @@ struct tracer {
int (*selftest)(struct tracer *trace, int (*selftest)(struct tracer *trace,
struct trace_array *tr); struct trace_array *tr);
#endif #endif
void (*print_header)(struct seq_file *m);
enum print_line_t (*print_line)(struct trace_iterator *iter); enum print_line_t (*print_line)(struct trace_iterator *iter);
/* If you handled the flag setting, return 0 */ /* If you handled the flag setting, return 0 */
int (*set_flag)(u32 old_flags, u32 bit, int set); int (*set_flag)(u32 old_flags, u32 bit, int set);