sched/debug: remove CONFIG_FAIR_GROUP_SCHED mask
PATCH 1/1 sched/debug: remove CONFIG_FAIR_GROUP_SCHED mask
Now we are using runnable load avg in sched balance. So don't need keep marking them under CONFIG_FAIR_GROUP_SCHED. Also align the code style to #ifdef instead of #if defined() and reorder the tg output info.
--- kernel/sched/debug.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
kernel/sched/debug.c +6 -4
@@ -209,22 +209,24 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) cfs_rq->nr_spread_over);SEQ_printf (m," .%-30s: %d\n" ,"nr_running" , cfs_rq->nr_running);SEQ_printf (m," .%-30s: %ld\n" ,"load" , cfs_rq->load.weight); -#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_SMP SEQ_printf (m," .%-30s: %ld\n" ,"runnable_load_avg" , cfs_rq->runnable_load_avg);SEQ_printf (m," .%-30s: %ld\n" ,"blocked_load_avg" , cfs_rq->blocked_load_avg); -SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_avg" , -atomic_long_read (&cfs_rq->tg->load_avg)); +#ifdef CONFIG_FAIR_GROUP_SCHED SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_contrib" , cfs_rq->tg_load_contrib);SEQ_printf (m," .%-30s: %d\n" ,"tg_runnable_contrib" , cfs_rq->tg_runnable_contrib); +SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_avg" , +atomic_long_read (&cfs_rq->tg->load_avg));SEQ_printf (m," .%-30s: %d\n" ,"tg->runnable_avg" ,atomic_read (&cfs_rq->tg->runnable_avg));#endif +#endif +#ifdef CONFIG_FAIR_GROUP_SCHED print_cfs_group_stats (m, cpu, cfs_rq->tg);#endif }
@@ -566,7 +568,7 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) "nr_involuntary_switches", (long long)p->nivcsw);P (se.load.weight); -#if defined(CONFIG_SMP ) && defined(CONFIG_FAIR_GROUP_SCHED ) +#ifdef CONFIG_SMP P (se.avg.runnable_avg_sum);P (se.avg.runnable_avg_period);P (se.avg.load_avg_contrib);
Signature · 1 line
1.7.5.4
Quoted 5 lines · Alex Shi
Now we are using runnable load avg in sched balance. So don't need keep marking them under
CONFIG_FAIR_GROUP_SCHED. Also align the code style to #ifdef instead of #ifdefined()and reorder the tg output info.Signed-off-by Alex Shi <[email protected]>
tip-bot for Alex Shi
merge bot[tip:sched/core] sched/debug: Remove CONFIG_FAIR_GROUP_SCHED mask
In reply to Alex Shisched/debug: Remove CONFIG_FAIR_GROUP_SCHED mask
Commit-ID: 333bb864f192015a53b5060b829089decd0220ef Gitweb: http://git.kernel.org/tip/333bb864f192015a53b5060b829089decd0220ef Author: Alex Shi <[email protected]> AuthorDate: Fri, 28 Jun 2013 19:10:35 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 28 Jun 2013 13:17:17 +0200
sched/debug: Remove CONFIG_FAIR_GROUP_SCHED mask
Now that we are using runnable load avg in sched balance, we don't need to keep it under CONFIG_FAIR_GROUP_SCHED.
Also align the code style to #ifdef instead of #if defined() and reorder the tg output info.
--- kernel/sched/debug.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
kernel/sched/debug.c +6 -4
@@ -209,22 +209,24 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq) cfs_rq->nr_spread_over);SEQ_printf (m," .%-30s: %d\n" ,"nr_running" , cfs_rq->nr_running);SEQ_printf (m," .%-30s: %ld\n" ,"load" , cfs_rq->load.weight); -#ifdef CONFIG_FAIR_GROUP_SCHED #ifdef CONFIG_SMP SEQ_printf (m," .%-30s: %ld\n" ,"runnable_load_avg" , cfs_rq->runnable_load_avg);SEQ_printf (m," .%-30s: %ld\n" ,"blocked_load_avg" , cfs_rq->blocked_load_avg); -SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_avg" , -atomic_long_read (&cfs_rq->tg->load_avg)); +#ifdef CONFIG_FAIR_GROUP_SCHED SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_contrib" , cfs_rq->tg_load_contrib);SEQ_printf (m," .%-30s: %d\n" ,"tg_runnable_contrib" , cfs_rq->tg_runnable_contrib); +SEQ_printf (m," .%-30s: %ld\n" ,"tg_load_avg" , +atomic_long_read (&cfs_rq->tg->load_avg));SEQ_printf (m," .%-30s: %d\n" ,"tg->runnable_avg" ,atomic_read (&cfs_rq->tg->runnable_avg));#endif +#endif +#ifdef CONFIG_FAIR_GROUP_SCHED print_cfs_group_stats (m, cpu, cfs_rq->tg);#endif }
@@ -567,7 +569,7 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m) "nr_involuntary_switches", (long long)p->nivcsw);P (se.load.weight); -#if defined(CONFIG_SMP ) && defined(CONFIG_FAIR_GROUP_SCHED ) +#ifdef CONFIG_SMP P (se.avg.runnable_avg_sum);P (se.avg.runnable_avg_period);P (se.avg.load_avg_contrib);