aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-12 21:20:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 21:07:31 +0200
commit4ac3ba41d372e3a9e420b36bc43589662b188a14 (patch)
treeb8dd93a0226a92b5f55e5ff1e51712424a7be729
parent1a3c3034336320554a3342572dae98d69e054fc7 (diff)
ftrace: trace scheduler rbtree
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/trace/trace.c1
-rw-r--r--kernel/trace/trace.h1
-rw-r--r--kernel/trace/trace_sched_switch.c6
3 files changed, 6 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 65d2c0a61ed..06380dc1ebe 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -129,6 +129,7 @@ static const char *trace_options[] = {
"bin",
"block",
"stacktrace",
+ "sched-tree",
NULL
};
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 75e23747567..a52015702a2 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -286,6 +286,7 @@ enum trace_iterator_flags {
TRACE_ITER_BIN = 0x40,
TRACE_ITER_BLOCK = 0x80,
TRACE_ITER_STACKTRACE = 0x100,
+ TRACE_ITER_SCHED_TREE = 0x200,
};
#endif /* _LINUX_KERNEL_TRACE_H */
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index 12658b3f2b2..5555b906a66 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -36,7 +36,8 @@ ctx_switch_func(void *__rq, struct task_struct *prev, struct task_struct *next)
if (likely(disabled == 1)) {
tracing_sched_switch_trace(tr, data, prev, next, flags);
- ftrace_all_fair_tasks(__rq, tr, data);
+ if (trace_flags & TRACE_ITER_SCHED_TREE)
+ ftrace_all_fair_tasks(__rq, tr, data);
}
atomic_dec(&data->disabled);
@@ -62,7 +63,8 @@ wakeup_func(void *__rq, struct task_struct *wakee, struct task_struct *curr)
if (likely(disabled == 1)) {
tracing_sched_wakeup_trace(tr, data, wakee, curr, flags);
- ftrace_all_fair_tasks(__rq, tr, data);
+ if (trace_flags & TRACE_ITER_SCHED_TREE)
+ ftrace_all_fair_tasks(__rq, tr, data);
}
atomic_dec(&data->disabled);