tracing, function_graph: Add context-info support for function_graph tracer
The function_graph tracer does not follow global context-info option. Adding TRACE_ITER_CONTEXT_INFO trace_flags check to enable it. With following commands: # echo function_graph > ./current_tracer # echo 0 > options/context-info # cat trace This is what it looked like before: # tracer: function_graph # # TIME CPU DURATION FUNCTION CALLS # | | | | | | | | 1) 0.079 us | } /* __vma_link_rb */ 1) 0.056 us | copy_page_range(); 1) | security_vm_enough_memory() { ... This is what it looks like now: # tracer: function_graph # } /* update_ts_time_stats */ timekeeping_max_deferment(); ... Signed-off-by: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/r/1307113131-10045-6-git-send-email-jolsa@redhat.com Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Родитель
199abfab40
Коммит
749230b06a
|
@ -613,28 +613,30 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,
|
||||||
addr >= (unsigned long)__irqentry_text_end)
|
addr >= (unsigned long)__irqentry_text_end)
|
||||||
return TRACE_TYPE_UNHANDLED;
|
return TRACE_TYPE_UNHANDLED;
|
||||||
|
|
||||||
/* Absolute time */
|
if (trace_flags & TRACE_ITER_CONTEXT_INFO) {
|
||||||
if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
/* Absolute time */
|
||||||
ret = print_graph_abs_time(iter->ts, s);
|
if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
||||||
if (!ret)
|
ret = print_graph_abs_time(iter->ts, s);
|
||||||
return TRACE_TYPE_PARTIAL_LINE;
|
if (!ret)
|
||||||
}
|
return TRACE_TYPE_PARTIAL_LINE;
|
||||||
|
}
|
||||||
|
|
||||||
/* Cpu */
|
/* Cpu */
|
||||||
if (flags & TRACE_GRAPH_PRINT_CPU) {
|
if (flags & TRACE_GRAPH_PRINT_CPU) {
|
||||||
ret = print_graph_cpu(s, cpu);
|
ret = print_graph_cpu(s, cpu);
|
||||||
if (ret == TRACE_TYPE_PARTIAL_LINE)
|
if (ret == TRACE_TYPE_PARTIAL_LINE)
|
||||||
return TRACE_TYPE_PARTIAL_LINE;
|
return TRACE_TYPE_PARTIAL_LINE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Proc */
|
/* Proc */
|
||||||
if (flags & TRACE_GRAPH_PRINT_PROC) {
|
if (flags & TRACE_GRAPH_PRINT_PROC) {
|
||||||
ret = print_graph_proc(s, pid);
|
ret = print_graph_proc(s, pid);
|
||||||
if (ret == TRACE_TYPE_PARTIAL_LINE)
|
if (ret == TRACE_TYPE_PARTIAL_LINE)
|
||||||
return TRACE_TYPE_PARTIAL_LINE;
|
return TRACE_TYPE_PARTIAL_LINE;
|
||||||
ret = trace_seq_printf(s, " | ");
|
ret = trace_seq_printf(s, " | ");
|
||||||
if (!ret)
|
if (!ret)
|
||||||
return TRACE_TYPE_PARTIAL_LINE;
|
return TRACE_TYPE_PARTIAL_LINE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* No overhead */
|
/* No overhead */
|
||||||
|
@ -710,8 +712,9 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s,
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
|
|
||||||
if (!(flags & TRACE_GRAPH_PRINT_DURATION))
|
if (!(flags & TRACE_GRAPH_PRINT_DURATION) ||
|
||||||
return TRACE_TYPE_HANDLED;
|
!(trace_flags & TRACE_ITER_CONTEXT_INFO))
|
||||||
|
return TRACE_TYPE_HANDLED;
|
||||||
|
|
||||||
/* No real adata, just filling the column with spaces */
|
/* No real adata, just filling the column with spaces */
|
||||||
switch (duration) {
|
switch (duration) {
|
||||||
|
@ -879,6 +882,9 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,
|
||||||
return TRACE_TYPE_PARTIAL_LINE;
|
return TRACE_TYPE_PARTIAL_LINE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
|
||||||
|
return 0;
|
||||||
|
|
||||||
/* Absolute time */
|
/* Absolute time */
|
||||||
if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
||||||
ret = print_graph_abs_time(iter->ts, s);
|
ret = print_graph_abs_time(iter->ts, s);
|
||||||
|
@ -1346,6 +1352,9 @@ void print_graph_headers_flags(struct seq_file *s, u32 flags)
|
||||||
{
|
{
|
||||||
struct trace_iterator *iter = s->private;
|
struct trace_iterator *iter = s->private;
|
||||||
|
|
||||||
|
if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
|
||||||
|
return;
|
||||||
|
|
||||||
if (trace_flags & TRACE_ITER_LATENCY_FMT) {
|
if (trace_flags & TRACE_ITER_LATENCY_FMT) {
|
||||||
/* print nothing if the buffers are empty */
|
/* print nothing if the buffers are empty */
|
||||||
if (trace_empty(iter))
|
if (trace_empty(iter))
|
||||||
|
|
Загрузка…
Ссылка в новой задаче