Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 199abfab40389963b397c2982222e68ea782b2cf

Authored by Jiri Olsa
Committed by Steven Rostedt
1 parent f56e7f8efb
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

tracing, function_graph: Remove lock-depth from latency trace 

The lock_depth was removed in commit
e6e1e25 tracing: Remove lock_depth from event entry

Removing the lock_depth info from function_graph latency header.

With following commands:
	# echo function_graph > ./current_tracer
	# echo 1 > options/latency-format
	# cat trace

This is what it looked like before:
# tracer: function_graph
#
# function_graph latency trace v1.1.5 on 3.0.0-rc1-tip+
# --------------------------------------------------------------------
# latency: 0 us, #59756/311298, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2)
#    -----------------
#    | task: -0 (uid:0 nice:0 policy:0 rt_prio:0)
#    -----------------
#
#      _-----=> irqs-off
#     / _----=> need-resched
#    | / _---=> hardirq/softirq
#    || / _--=> preempt-depth
#    ||| / _-=> lock-depth
#    |||| /
# CPU|||||  DURATION                  FUNCTION CALLS
# |  |||||   |   |                     |   |   |   |
 0)  ....  0.068 us    |    } /* __rcu_read_unlock */
...

This is what it looks like now:
# tracer: function_graph
#
# function_graph latency trace v1.1.5 on 3.0.0-rc1-tip+
# --------------------------------------------------------------------
# latency: 0 us, #59747/1744610, CPU#0 | (M:preempt VP:0, KP:0, SP:0 HP:0 #P:2)
#    -----------------
#    | task: -0 (uid:0 nice:0 policy:0 rt_prio:0)
#    -----------------
#
#      _-----=> irqs-off
#     / _----=> need-resched
#    | / _---=> hardirq/softirq
#    || / _--=> preempt-depth
#    ||| /
# CPU||||  DURATION                  FUNCTION CALLS
# |  ||||   |   |                     |   |   |   |
 0)  ..s.  1.641 us    |  } /* __rcu_process_callbacks */
...

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1307113131-10045-5-git-send-email-jolsa@redhat.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

kernel/trace/trace_functions_graph.c
Diff comments   View file @ 199abfa
... ... @@ -1298,8 +1298,7 @@
1298 1298 seq_printf(s, "#%.*s / _----=> need-resched \n", size, spaces);
1299 1299 seq_printf(s, "#%.*s| / _---=> hardirq/softirq \n", size, spaces);
1300 1300 seq_printf(s, "#%.*s|| / _--=> preempt-depth \n", size, spaces);
1301   - seq_printf(s, "#%.*s||| / _-=> lock-depth \n", size, spaces);
1302   - seq_printf(s, "#%.*s|||| / \n", size, spaces);
  1301 + seq_printf(s, "#%.*s||| / \n", size, spaces);
1303 1302 }
1304 1303  
1305 1304 static void __print_graph_headers_flags(struct seq_file *s, u32 flags)
... ... @@ -1318,7 +1317,7 @@
1318 1317 if (flags & TRACE_GRAPH_PRINT_PROC)
1319 1318 seq_printf(s, " TASK/PID ");
1320 1319 if (lat)
1321   - seq_printf(s, "|||||");
  1320 + seq_printf(s, "||||");
1322 1321 if (flags & TRACE_GRAPH_PRINT_DURATION)
1323 1322 seq_printf(s, " DURATION ");
1324 1323 seq_printf(s, " FUNCTION CALLS\n");
... ... @@ -1332,7 +1331,7 @@
1332 1331 if (flags & TRACE_GRAPH_PRINT_PROC)
1333 1332 seq_printf(s, " | | ");
1334 1333 if (lat)
1335   - seq_printf(s, "|||||");
  1334 + seq_printf(s, "||||");
1336 1335 if (flags & TRACE_GRAPH_PRINT_DURATION)
1337 1336 seq_printf(s, " | | ");
1338 1337 seq_printf(s, " | | | |\n");