Commit 321e68b095addc473ca52ced9acfa59be88f76e6
Committed by
Steven Rostedt
1 parent
84c15027a7
Exists in
master
and in
4 other branches
tracing, function_graph: Remove dependency of abstime and duration fields on latency
The display of absolute time and duration fields is based on the latency field. This was added during the irqsoff/wakeup tracers graph support changes. It's causing confusion in what fields will be displayed for the function_graph tracer itself. So I'm removing this depency, and adding absolute time and duration fields to the preemptirqsoff preemptoff irqsoff wakeup tracers. With following commands: # echo function_graph > ./current_tracer # cat trace This is what it looked like before: # tracer: function_graph # # TIME CPU DURATION FUNCTION CALLS # | | | | | | | | 0) 0.068 us | } /* page_add_file_rmap */ 0) | _raw_spin_unlock() { ... This is what it looks like now: # tracer: function_graph # # CPU DURATION FUNCTION CALLS # | | | | | | | 0) 0.068 us | } /* add_preempt_count */ 0) 0.993 us | } /* vfsmount_lock_local_lock */ ... For preemptirqsoff preemptoff irqsoff wakeup tracers, this is what it looked like before: SNIP # _-----=> irqs-off # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / _-=> lock-depth # |||| / # CPU TASK/PID ||||| DURATION FUNCTION CALLS # | | | ||||| | | | | | | 1) <idle>-0 | d..1 0.000 us | acpi_idle_enter_simple(); ... This is what it looks like now: SNIP # # _-----=> irqs-off # / _----=> need-resched # | / _---=> hardirq/softirq # || / _--=> preempt-depth # ||| / # TIME CPU TASK/PID |||| DURATION FUNCTION CALLS # | | | | |||| | | | | | | 19.847735 | 1) <idle>-0 | d..1 0.000 us | acpi_idle_enter_simple(); ... Signed-off-by: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/r/1307113131-10045-2-git-send-email-jolsa@redhat.com Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Showing 3 changed files with 9 additions and 18 deletions Side-by-side Diff
kernel/trace/trace_functions_graph.c
... | ... | @@ -1207,7 +1207,7 @@ |
1207 | 1207 | |
1208 | 1208 | |
1209 | 1209 | enum print_line_t |
1210 | -__print_graph_function_flags(struct trace_iterator *iter, u32 flags) | |
1210 | +print_graph_function_flags(struct trace_iterator *iter, u32 flags) | |
1211 | 1211 | { |
1212 | 1212 | struct ftrace_graph_ent_entry *field; |
1213 | 1213 | struct fgraph_data *data = iter->private; |
1214 | 1214 | |
... | ... | @@ -1270,20 +1270,9 @@ |
1270 | 1270 | static enum print_line_t |
1271 | 1271 | print_graph_function(struct trace_iterator *iter) |
1272 | 1272 | { |
1273 | - return __print_graph_function_flags(iter, tracer_flags.val); | |
1273 | + return print_graph_function_flags(iter, tracer_flags.val); | |
1274 | 1274 | } |
1275 | 1275 | |
1276 | -enum print_line_t print_graph_function_flags(struct trace_iterator *iter, | |
1277 | - u32 flags) | |
1278 | -{ | |
1279 | - if (trace_flags & TRACE_ITER_LATENCY_FMT) | |
1280 | - flags |= TRACE_GRAPH_PRINT_DURATION; | |
1281 | - else | |
1282 | - flags |= TRACE_GRAPH_PRINT_ABS_TIME; | |
1283 | - | |
1284 | - return __print_graph_function_flags(iter, flags); | |
1285 | -} | |
1286 | - | |
1287 | 1276 | static enum print_line_t |
1288 | 1277 | print_graph_function_event(struct trace_iterator *iter, int flags, |
1289 | 1278 | struct trace_event *event) |
... | ... | @@ -1364,9 +1353,7 @@ |
1364 | 1353 | return; |
1365 | 1354 | |
1366 | 1355 | print_trace_header(s, iter); |
1367 | - flags |= TRACE_GRAPH_PRINT_DURATION; | |
1368 | - } else | |
1369 | - flags |= TRACE_GRAPH_PRINT_ABS_TIME; | |
1356 | + } | |
1370 | 1357 | |
1371 | 1358 | __print_graph_headers_flags(s, flags); |
1372 | 1359 | } |
kernel/trace/trace_irqsoff.c
... | ... | @@ -226,7 +226,9 @@ |
226 | 226 | } |
227 | 227 | |
228 | 228 | #define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_CPU | \ |
229 | - TRACE_GRAPH_PRINT_PROC) | |
229 | + TRACE_GRAPH_PRINT_PROC | \ | |
230 | + TRACE_GRAPH_PRINT_ABS_TIME | \ | |
231 | + TRACE_GRAPH_PRINT_DURATION) | |
230 | 232 | |
231 | 233 | static enum print_line_t irqsoff_print_line(struct trace_iterator *iter) |
232 | 234 | { |
kernel/trace/trace_sched_wakeup.c
... | ... | @@ -227,7 +227,9 @@ |
227 | 227 | graph_trace_close(iter); |
228 | 228 | } |
229 | 229 | |
230 | -#define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_PROC) | |
230 | +#define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_PROC | \ | |
231 | + TRACE_GRAPH_PRINT_ABS_TIME | \ | |
232 | + TRACE_GRAPH_PRINT_DURATION) | |
231 | 233 | |
232 | 234 | static enum print_line_t wakeup_print_line(struct trace_iterator *iter) |
233 | 235 | { |