lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tracing: fix multiple use of __print_flags and __print_symbolic

Browse Source 
Here is an updated patch to include the extra call to
trace_seq_init() as requested. This is vs. the latest
-tip tree and fixes the use of multiple __print_flags
and __print_symbolic in a single tracer. Also tested
to ensure its working now:

mount.gfs2-2534  [000]   235.850587: gfs2_glock_queue: 8.7 glock 1:2 dequeue PR
mount.gfs2-2534  [000]   235.850591: gfs2_demote_rq: 8.7 glock 1:0 demote EX to NL flags:DI
mount.gfs2-2534  [000]   235.850591: gfs2_glock_queue: 8.7 glock 1:0 dequeue EX
glock_workqueue-2529  [000]   235.850666: gfs2_glock_state_change: 8.7 glock 1:0 state EX => NL tgt:NL dmt:NL flags:lDpI
glock_workqueue-2529  [000]   235.850672: gfs2_glock_put: 8.7 glock 1:0 state NL => IV flags:I

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
LKML-Reference: <1244037123.29604.603.camel@localhost.localdomain>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Whitehouse
2009-06-03 14:52:03 +01:00
committed by Steven Rostedt
parent 048dc50c5e
commit 56d8bd3f0b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/trace/ftrace.h
View File

@@ -104,6 +104,7 @@
* field = (typeof(field))entry; * field = (typeof(field))entry;
* *
* p = get_cpu_var(ftrace_event_seq); * p = get_cpu_var(ftrace_event_seq);
* trace_seq_init(p);
* ret = trace_seq_printf(s, <TP_printk> "\n"); * ret = trace_seq_printf(s, <TP_printk> "\n");
* put_cpu(); * put_cpu();
* if (!ret) * if (!ret)
@@ -167,6 +168,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \
field = (typeof(field))entry; \ field = (typeof(field))entry; \
\ \
p = &get_cpu_var(ftrace_event_seq); \ p = &get_cpu_var(ftrace_event_seq); \
trace_seq_init(p); \
ret = trace_seq_printf(s, #call ": " print); \ ret = trace_seq_printf(s, #call ": " print); \
put_cpu(); \ put_cpu(); \
if (!ret) \ if (!ret) \

10
kernel/trace/trace_output.c
View File

@@ -223,10 +223,9 @@ ftrace_print_flags_seq(struct trace_seq *p, const char *delim,
{ {
unsigned long mask; unsigned long mask;
const char *str; const char *str;
const char *ret = p->buffer + p->len;
int i; int i;
trace_seq_init(p);
for (i = 0; flag_array[i].name && flags; i++) { for (i = 0; flag_array[i].name && flags; i++) {
mask = flag_array[i].mask; mask = flag_array[i].mask;
@@ -249,7 +248,7 @@ ftrace_print_flags_seq(struct trace_seq *p, const char *delim,
trace_seq_putc(p, 0); trace_seq_putc(p, 0);
return p->buffer; return ret;
} }
EXPORT_SYMBOL(ftrace_print_flags_seq); EXPORT_SYMBOL(ftrace_print_flags_seq);
@@ -258,8 +257,7 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,
const struct trace_print_flags *symbol_array) const struct trace_print_flags *symbol_array)
{ {
int i; int i;
const char *ret = p->buffer + p->len;
trace_seq_init(p);
for (i = 0; symbol_array[i].name; i++) { for (i = 0; symbol_array[i].name; i++) {
@@ -275,7 +273,7 @@ ftrace_print_symbols_seq(struct trace_seq *p, unsigned long val,
trace_seq_putc(p, 0); trace_seq_putc(p, 0);
return p->buffer; return ret;
} }
EXPORT_SYMBOL(ftrace_print_symbols_seq); EXPORT_SYMBOL(ftrace_print_symbols_seq);