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 05/21] sched: Clean up ttwu stats
    Collect all ttwu stat code into a single function and ensure its
    always called for an actual wakeup (changing p->state to
    TASK_RUNNING).

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

    Index: linux-2.6/kernel/sched.c
    ===================================================================
    --- linux-2.6.orig/kernel/sched.c
    +++ linux-2.6/kernel/sched.c
    @@ -2408,21 +2408,38 @@ static void update_avg(u64 *avg, u64 sam
    }
    #endif

    -static inline void ttwu_activate(struct task_struct *p, struct rq *rq,
    - bool is_sync, bool is_migrate, bool is_local,
    - unsigned long en_flags)
    +static void
    +ttwu_stat(struct rq *rq, struct task_struct *p, int cpu, int wake_flags)
    {
    +#ifdef CONFIG_SCHEDSTATS
    + int this_cpu = smp_processor_id();
    +
    + schedstat_inc(rq, ttwu_count);
    schedstat_inc(p, se.statistics.nr_wakeups);
    - if (is_sync)
    +
    + if (wake_flags & WF_SYNC)
    schedstat_inc(p, se.statistics.nr_wakeups_sync);
    - if (is_migrate)
    +
    + if (cpu != task_cpu(p))
    schedstat_inc(p, se.statistics.nr_wakeups_migrate);
    - if (is_local)
    +
    +#ifdef CONFIG_SMP
    + if (cpu == this_cpu) {
    + schedstat_inc(rq, ttwu_local);
    schedstat_inc(p, se.statistics.nr_wakeups_local);
    - else
    - schedstat_inc(p, se.statistics.nr_wakeups_remote);
    + } else {
    + struct sched_domain *sd;

    - activate_task(rq, p, en_flags);
    + schedstat_inc(p, se.statistics.nr_wakeups_remote);
    + for_each_domain(this_cpu, sd) {
    + if (cpumask_test_cpu(cpu, sched_domain_span(sd))) {
    + schedstat_inc(sd, ttwu_wake_remote);
    + break;
    + }
    + }
    + }
    +#endif /* CONFIG_SMP */
    +#endif /* CONFIG_SCHEDSTATS */
    }

    static void
    @@ -2482,12 +2499,12 @@ static int try_to_wake_up(struct task_st
    if (!(p->state & state))
    goto out;

    + cpu = task_cpu(p);
    +
    if (p->se.on_rq)
    goto out_running;

    - cpu = task_cpu(p);
    orig_cpu = cpu;
    -
    #ifdef CONFIG_SMP
    if (unlikely(task_running(rq, p)))
    goto out_activate;
    @@ -2528,27 +2545,12 @@ static int try_to_wake_up(struct task_st
    WARN_ON(task_cpu(p) != cpu);
    WARN_ON(p->state != TASK_WAKING);

    -#ifdef CONFIG_SCHEDSTATS
    - schedstat_inc(rq, ttwu_count);
    - if (cpu == this_cpu)
    - schedstat_inc(rq, ttwu_local);
    - else {
    - struct sched_domain *sd;
    - for_each_domain(this_cpu, sd) {
    - if (cpumask_test_cpu(cpu, sched_domain_span(sd))) {
    - schedstat_inc(sd, ttwu_wake_remote);
    - break;
    - }
    - }
    - }
    -#endif /* CONFIG_SCHEDSTATS */
    -
    out_activate:
    #endif /* CONFIG_SMP */
    - ttwu_activate(p, rq, wake_flags & WF_SYNC, orig_cpu != cpu,
    - cpu == this_cpu, en_flags);
    + activate_task(rq, p, en_flags);
    out_running:
    ttwu_post_activation(p, rq, wake_flags);
    + ttwu_stat(rq, p, cpu, wake_flags);
    success = 1;
    out:
    task_rq_unlock(rq, &flags);
    @@ -2576,14 +2578,11 @@ static void try_to_wake_up_local(struct
    if (!(p->state & TASK_NORMAL))
    return;

    - if (!p->se.on_rq) {
    - if (likely(!task_running(rq, p))) {
    - schedstat_inc(rq, ttwu_count);
    - schedstat_inc(rq, ttwu_local);
    - }
    - ttwu_activate(p, rq, false, false, true, ENQUEUE_WAKEUP);
    - }
    + if (!p->se.on_rq)
    + activate_task(rq, p, ENQUEUE_WAKEUP);
    +
    ttwu_post_activation(p, rq, 0);
    + ttwu_stat(rq, p, smp_processor_id(), 0);
    }

    /**



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