LKML <[email protected]>, Peter Ziljstra <[email protected]>, Henrik Austad <[email protected]>
Subject: [PATCH 1/2] sched: Move priority calculation into sched_class.
Date: Mon, 20 Apr 2009 15:55:52 +0200
Message-Id: <[email protected]>
X-Mailer: git-send-email 1.6.1.2
When calculating the normal priority of a task, sched.c tested to see if the task was an RT-task, or other. By moving this into sched_class, the calculation becomes more modular, and the core scheduler becomes less aware of sched-class' internals.
Signed-off-by Henrik Austad <[email protected]>
Acked-by Peter Zijlstra <[email protected]>
--- include/linux/sched.h | 1 + kernel/sched.c | 16 +--------------- kernel/sched_fair.c | 7 +++++++ kernel/sched_idletask.c | 6 ++++++ kernel/sched_rt.c | 6 ++++++ 5 files changed, 21 insertions(+), 15 deletions(-)
include/linux/sched.h +1 -0
@@ -1018,6 +1018,7 @@ struct sched_class { int running);void (*prio_changed) (struct rq *this_rq,struct task_struct *task,int oldprio,int running); +int (*normal_prio) (struct task_struct *task);#ifdef CONFIG_FAIR_GROUP_SCHED void (*moved_group) (struct task_struct *p);
kernel/sched.c +1 -15
@@ -1806,14 +1806,6 @@ static void dequeue_task(struct rq *rq, struct task_struct *p, int sleep) }/* -* __normal_prio - return the priority that is based on the static prio -*/ -static inline int __normal_prio (struct task_struct *p) -{ -return p->static_prio; -} - -/* * Calculate the expected normal priority: i.e. priority * without taking RT-inheritance into account. Might be * boosted by interactivity modifiers. Changes upon fork,
@@ -1822,13 +1814,7 @@ static inline int __normal_prio(struct task_struct *p)*/ static inline int normal_prio (struct task_struct *p) { -int prio; - -if (task_has_rt_policy (p)) - prio =MAX_RT_PRIO -1 - p->rt_priority; -else - prio =__normal_prio (p); -return prio; +return p->sched_class->normal_prio (p); }/*
kernel/sched_fair.c +7 -0
@@ -1749,6 +1749,12 @@ static void prio_changed_fair(struct rq *rq, struct task_struct *p,check_preempt_curr (rq, p,0 ); } +/* Return the expected, normal priority */ +static int normal_prio_fair (struct task_struct *p) +{ +return p->static_prio; +} +/* * We switched to the sched_fair class. */
@@ -1815,6 +1821,7 @@ static const struct sched_class fair_sched_class = { .task_new = task_new_fair, .prio_changed = prio_changed_fair, + .normal_prio = normal_prio_fair, .switched_to = switched_to_fair,#ifdef CONFIG_FAIR_GROUP_SCHED
kernel/sched_idletask.c +6 -0
@@ -96,6 +96,11 @@ static void prio_changed_idle(struct rq *rq, struct task_struct *p,check_preempt_curr (rq, p,0 ); } +static int normal_prio_idle (struct task_struct *p) +{ +return p->static_prio; +} +/* * Simple, special scheduling class for the per-CPU idle tasks: */
@@ -122,6 +127,7 @@ static const struct sched_class idle_sched_class = { .task_tick = task_tick_idle, .prio_changed = prio_changed_idle, + .normal_prio = normal_prio_idle, .switched_to = switched_to_idle,/* no .task_new for idle tasks */
kernel/sched_rt.c +6 -0
@@ -1664,6 +1664,11 @@ static void prio_changed_rt(struct rq *rq, struct task_struct *p, } } +static int normal_prio_rt (struct task_struct *p) +{ +return MAX_RT_PRIO -1 - p->rt_priority; +} +static void watchdog (struct rq *rq,struct task_struct *p) {unsigned long soft, hard;
@@ -1752,6 +1757,7 @@ static const struct sched_class rt_sched_class = { .task_tick = task_tick_rt, .prio_changed = prio_changed_rt, + .normal_prio = normal_prio_rt, .switched_to = switched_to_rt, };
Signature · 1 line
1.6.1.2