lkml.org 
[lkml]   [2009]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:tracing/core] ftrace: clean up enable logic for sched_switch
Commit-ID:  dcef788eb9659b61a2110284fcce3ca6e63480d2
Gitweb: http://git.kernel.org/tip/dcef788eb9659b61a2110284fcce3ca6e63480d2
Author: Zhaolei <zhaolei@cn.fujitsu.com>
AuthorDate: Tue, 31 Mar 2009 15:26:14 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 7 Apr 2009 14:43:09 +0200

ftrace: clean up enable logic for sched_switch

Unify sched_switch and sched_wakeup's action to following logic:
Do record_cmdline when start_cmdline_record() is called.
Start tracing events when the tracer is started.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
LKML-Reference: <49D1C596.5050203@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>


---
kernel/trace/trace_sched_switch.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c
index 9117cea..9d8cccd 100644
--- a/kernel/trace/trace_sched_switch.c
+++ b/kernel/trace/trace_sched_switch.c
@@ -29,13 +29,13 @@ probe_sched_switch(struct rq *__rq, struct task_struct *prev,
int cpu;
int pc;

- if (!sched_ref || sched_stopped)
+ if (unlikely(!sched_ref))
return;

tracing_record_cmdline(prev);
tracing_record_cmdline(next);

- if (!tracer_enabled)
+ if (!tracer_enabled || sched_stopped)
return;

pc = preempt_count();
@@ -56,15 +56,15 @@ probe_sched_wakeup(struct rq *__rq, struct task_struct *wakee, int success)
unsigned long flags;
int cpu, pc;

- if (!likely(tracer_enabled))
+ if (unlikely(!sched_ref))
return;

- pc = preempt_count();
tracing_record_cmdline(current);

- if (sched_stopped)
+ if (!tracer_enabled || sched_stopped)
return;

+ pc = preempt_count();
local_irq_save(flags);
cpu = raw_smp_processor_id();
data = ctx_trace->data[cpu];

\
 
 \ /
  Last update: 2009-04-08 08:59    [from the cache]
©2003-2011 Jasper Spaans