Messages in this thread Patch in this message | | | Date | Tue, 31 Mar 2009 00:12:12 -0400 (EDT) | From | Steven Rostedt <> | Subject | Re: [PATCH 2/2] ftrace: Clean up enable logic for sched_switch |
| |
On Tue, 31 Mar 2009, Zhaolei wrote: > > diff --git a/kernel/trace/trace_sched_switch.c b/kernel/trace/trace_sched_switch.c > index 9117cea..b6a0938 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 (!likely(sched_ref))
That should be:
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 (!likely(sched_ref))
Same here.
-- Steve
> 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]; > -- > 1.5.5.3 > > >
| |