Re: [RESEND PATCH 2/3 v5] sched: Rewrite per entity runnable load average tracking

[Dietmar Eggemann <dietmar.eggemann@arm.com>]

On 10/10/14 04:21, Yuyang Du wrote:

[...]

> @@ -331,21 +330,16 @@ struct cfs_rq {
>
>   #ifdef CONFIG_SMP
>          /*
> -        * CFS Load tracking
> -        * Under CFS, load is tracked on a per-entity basis and aggregated up.
> -        * This allows for the description of both thread and group usage (in
> -        * the FAIR_GROUP_SCHED case).
> +        * CFS load tracking
>           */
> -       unsigned long runnable_load_avg, blocked_load_avg;
> -       atomic64_t decay_counter;
> -       u64 last_decay;
> -       atomic_long_t removed_load;
> +       struct sched_avg avg;
> +       unsigned long tg_load_avg_contrib;

IMHO, unsigned long tg_load_avg_contrib (former unsigned long 
tg_load_contrib) can stay under #ifdef CONFIG_FAIR_GROUP_SCHED.

> +       atomic_long_t removed_load_avg;
> +#ifndef CONFIG_64BIT
> +       u64 load_last_update_time_copy;
> +#endif
>
>   #ifdef CONFIG_FAIR_GROUP_SCHED
> -       /* Required to track per-cpu representation of a task_group */
> -       u32 tg_runnable_contrib;
> -       unsigned long tg_load_contrib;
> -
>          /*
>           *   h_load = weight * f(tg)
>           *

[...]