|
@@ -613,28 +613,30 @@ print_graph_irq(struct trace_iterator *iter, unsigned long addr,
|
|
|
addr >= (unsigned long)__irqentry_text_end)
|
|
|
return TRACE_TYPE_UNHANDLED;
|
|
|
|
|
|
- /* Absolute time */
|
|
|
- if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
|
|
- ret = print_graph_abs_time(iter->ts, s);
|
|
|
- if (!ret)
|
|
|
- return TRACE_TYPE_PARTIAL_LINE;
|
|
|
- }
|
|
|
+ if (trace_flags & TRACE_ITER_CONTEXT_INFO) {
|
|
|
+ /* Absolute time */
|
|
|
+ if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
|
|
+ ret = print_graph_abs_time(iter->ts, s);
|
|
|
+ if (!ret)
|
|
|
+ return TRACE_TYPE_PARTIAL_LINE;
|
|
|
+ }
|
|
|
|
|
|
- /* Cpu */
|
|
|
- if (flags & TRACE_GRAPH_PRINT_CPU) {
|
|
|
- ret = print_graph_cpu(s, cpu);
|
|
|
- if (ret == TRACE_TYPE_PARTIAL_LINE)
|
|
|
- return TRACE_TYPE_PARTIAL_LINE;
|
|
|
- }
|
|
|
+ /* Cpu */
|
|
|
+ if (flags & TRACE_GRAPH_PRINT_CPU) {
|
|
|
+ ret = print_graph_cpu(s, cpu);
|
|
|
+ if (ret == TRACE_TYPE_PARTIAL_LINE)
|
|
|
+ return TRACE_TYPE_PARTIAL_LINE;
|
|
|
+ }
|
|
|
|
|
|
- /* Proc */
|
|
|
- if (flags & TRACE_GRAPH_PRINT_PROC) {
|
|
|
- ret = print_graph_proc(s, pid);
|
|
|
- if (ret == TRACE_TYPE_PARTIAL_LINE)
|
|
|
- return TRACE_TYPE_PARTIAL_LINE;
|
|
|
- ret = trace_seq_printf(s, " | ");
|
|
|
- if (!ret)
|
|
|
- return TRACE_TYPE_PARTIAL_LINE;
|
|
|
+ /* Proc */
|
|
|
+ if (flags & TRACE_GRAPH_PRINT_PROC) {
|
|
|
+ ret = print_graph_proc(s, pid);
|
|
|
+ if (ret == TRACE_TYPE_PARTIAL_LINE)
|
|
|
+ return TRACE_TYPE_PARTIAL_LINE;
|
|
|
+ ret = trace_seq_printf(s, " | ");
|
|
|
+ if (!ret)
|
|
|
+ return TRACE_TYPE_PARTIAL_LINE;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
/* No overhead */
|
|
@@ -710,8 +712,9 @@ print_graph_duration(unsigned long long duration, struct trace_seq *s,
|
|
|
{
|
|
|
int ret = -1;
|
|
|
|
|
|
- if (!(flags & TRACE_GRAPH_PRINT_DURATION))
|
|
|
- return TRACE_TYPE_HANDLED;
|
|
|
+ if (!(flags & TRACE_GRAPH_PRINT_DURATION) ||
|
|
|
+ !(trace_flags & TRACE_ITER_CONTEXT_INFO))
|
|
|
+ return TRACE_TYPE_HANDLED;
|
|
|
|
|
|
/* No real adata, just filling the column with spaces */
|
|
|
switch (duration) {
|
|
@@ -879,6 +882,9 @@ print_graph_prologue(struct trace_iterator *iter, struct trace_seq *s,
|
|
|
return TRACE_TYPE_PARTIAL_LINE;
|
|
|
}
|
|
|
|
|
|
+ if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
|
|
|
+ return 0;
|
|
|
+
|
|
|
/* Absolute time */
|
|
|
if (flags & TRACE_GRAPH_PRINT_ABS_TIME) {
|
|
|
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;
|
|
|
|
|
|
+ if (!(trace_flags & TRACE_ITER_CONTEXT_INFO))
|
|
|
+ return;
|
|
|
+
|
|
|
if (trace_flags & TRACE_ITER_LATENCY_FMT) {
|
|
|
/* print nothing if the buffers are empty */
|
|
|
if (trace_empty(iter))
|