lkml.org 
[lkml]   [2011]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/21] sched: Change the ttwu success details
    try_to_wake_up() would only return a success when it would have to
    place a task on a rq, change that to every time we change p->state to
    TASK_RUNNING, because that's the real measure of wakeups.

    This results in that success is always true for the tracepoints.

    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Reviewed-by: Frank Rowand <frank.rowand@am.sony.com>
    ---
    kernel/sched.c | 18 ++++++++----------
    1 file changed, 8 insertions(+), 10 deletions(-)

    Index: linux-2.6/kernel/sched.c
    ===================================================================
    --- linux-2.6.orig/kernel/sched.c
    +++ linux-2.6/kernel/sched.c
    @@ -2383,10 +2383,10 @@ static inline void ttwu_activate(struct
    activate_task(rq, p, en_flags);
    }

    -static inline void ttwu_post_activation(struct task_struct *p, struct rq *rq,
    - int wake_flags, bool success)
    +static void
    +ttwu_post_activation(struct task_struct *p, struct rq *rq, int wake_flags)
    {
    - trace_sched_wakeup(p, success);
    + trace_sched_wakeup(p, true);
    check_preempt_curr(rq, p, wake_flags);

    p->state = TASK_RUNNING;
    @@ -2406,7 +2406,7 @@ static inline void ttwu_post_activation(
    }
    #endif
    /* if a worker is waking up, notify workqueue */
    - if ((p->flags & PF_WQ_WORKER) && success)
    + if (p->flags & PF_WQ_WORKER)
    wq_worker_waking_up(p, cpu_of(rq));
    }

    @@ -2505,9 +2505,9 @@ static int try_to_wake_up(struct task_st
    #endif /* CONFIG_SMP */
    ttwu_activate(p, rq, wake_flags & WF_SYNC, orig_cpu != cpu,
    cpu == this_cpu, en_flags);
    - success = 1;
    out_running:
    - ttwu_post_activation(p, rq, wake_flags, success);
    + ttwu_post_activation(p, rq, wake_flags);
    + success = 1;
    out:
    task_rq_unlock(rq, &flags);
    put_cpu();
    @@ -2526,7 +2526,6 @@ static int try_to_wake_up(struct task_st
    static void try_to_wake_up_local(struct task_struct *p)
    {
    struct rq *rq = task_rq(p);
    - bool success = false;

    BUG_ON(rq != this_rq());
    BUG_ON(p == current);
    @@ -2541,9 +2540,8 @@ static void try_to_wake_up_local(struct
    schedstat_inc(rq, ttwu_local);
    }
    ttwu_activate(p, rq, false, false, true, ENQUEUE_WAKEUP);
    - success = true;
    }
    - ttwu_post_activation(p, rq, 0, success);
    + ttwu_post_activation(p, rq, 0);
    }

    /**
    @@ -2705,7 +2703,7 @@ void wake_up_new_task(struct task_struct

    rq = task_rq_lock(p, &flags);
    activate_task(rq, p, 0);
    - trace_sched_wakeup_new(p, 1);
    + trace_sched_wakeup_new(p, true);
    check_preempt_curr(rq, p, WF_FORK);
    #ifdef CONFIG_SMP
    if (p->sched_class->task_woken)



    \
     
     \ /
      Last update: 2011-04-05 17:33    [W:0.028 / U:92.620 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site