aboutsummaryrefslogtreecommitdiffstats
path: root/include/trace/ftrace.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2009-06-03 09:52:03 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-06-03 10:29:48 -0400
commit56d8bd3f0b98972312cad683947ec90b21011199 (patch)
tree8ed2bb43d0f00923dd81b5b2c19c91b09e3977c6 /include/trace/ftrace.h
parent048dc50c5e7eada19ebabbad70b7966d14283d41 (diff)
tracing: fix multiple use of __print_flags and __print_symbolic
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>
Diffstat (limited to 'include/trace/ftrace.h')
-rw-r--r--include/trace/ftrace.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index b5478dab579b..40ede4db4d88 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -104,6 +104,7 @@
104 * field = (typeof(field))entry; 104 * field = (typeof(field))entry;
105 * 105 *
106 * p = get_cpu_var(ftrace_event_seq); 106 * p = get_cpu_var(ftrace_event_seq);
107 * trace_seq_init(p);
107 * ret = trace_seq_printf(s, <TP_printk> "\n"); 108 * ret = trace_seq_printf(s, <TP_printk> "\n");
108 * put_cpu(); 109 * put_cpu();
109 * if (!ret) 110 * if (!ret)
@@ -167,6 +168,7 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags) \
167 field = (typeof(field))entry; \ 168 field = (typeof(field))entry; \
168 \ 169 \
169 p = &get_cpu_var(ftrace_event_seq); \ 170 p = &get_cpu_var(ftrace_event_seq); \
171 trace_seq_init(p); \
170 ret = trace_seq_printf(s, #call ": " print); \ 172 ret = trace_seq_printf(s, #call ": " print); \
171 put_cpu(); \ 173 put_cpu(); \
172 if (!ret) \ 174 if (!ret) \