lkml.org 
[lkml]   [2010]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [RFC][PATCH 14/17] sched: Remove rq argument to ttwu_stat()
    On Fri, Dec 24, 2010 at 01:23:52PM +0100, Peter Zijlstra wrote:
    >
    > Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    > ---
    > kernel/sched.c | 8 +++++---
    > 1 file changed, 5 insertions(+), 3 deletions(-)
    >
    > Index: linux-2.6/kernel/sched.c
    > ===================================================================
    > --- linux-2.6.orig/kernel/sched.c
    > +++ linux-2.6/kernel/sched.c
    > @@ -2367,10 +2367,11 @@ static void update_avg(u64 *avg, u64 sam
    > #endif
    >
    > static void
    > -ttwu_stat(struct rq *rq, struct task_struct *p, int cpu, int wake_flags)
    > +ttwu_stat(struct task_struct *p, int cpu, int wake_flags)
    > {
    > #ifdef CONFIG_SCHEDSTATS
    > int this_cpu = smp_processor_id();
    > + struct rq *rq = this_rq();

    task_rq(p)?

    >
    > schedstat_inc(rq, ttwu_count);
    > schedstat_inc(p, se.statistics.nr_wakeups);
    > @@ -2491,9 +2492,10 @@ try_to_wake_up(struct task_struct *p, un
    > activate_task(rq, p, ENQUEUE_WAKEUP | ENQUEUE_WAKING);
    > out_running:
    > ttwu_post_activation(p, rq, wake_flags);
    > - ttwu_stat(rq, p, cpu, wake_flags);
    > success = 1;
    > __task_rq_unlock(rq);
    > +
    > + ttwu_stat(p, cpu, wake_flags);

    Typo? You just put it out of rq_lock.

    Thanks,
    Yong

    > out:
    > raw_spin_unlock_irqrestore(&p->pi_lock, flags);
    > put_cpu();
    > @@ -2527,7 +2529,7 @@ static void try_to_wake_up_local(struct
    > activate_task(rq, p, ENQUEUE_WAKEUP);
    >
    > ttwu_post_activation(p, rq, 0);
    > - ttwu_stat(rq, p, smp_processor_id(), 0);
    > + ttwu_stat(p, smp_processor_id(), 0);
    > out:
    > raw_spin_unlock(&p->pi_lock);
    > }


    \
     
     \ /
      Last update: 2010-12-29 15:43    [W:0.021 / U:91.896 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site