rbtree, sched/fair: Use rb_add_cached()
Reduce rbtree boiler plate by using the new helper function. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Acked-by: Davidlohr Bueso <dbueso@suse.de>
This commit is contained in:
parent
2d24dd5798
commit
bf9be9a163
|
@ -531,12 +531,15 @@ static inline u64 min_vruntime(u64 min_vruntime, u64 vruntime)
|
||||||
return min_vruntime;
|
return min_vruntime;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int entity_before(struct sched_entity *a,
|
static inline bool entity_before(struct sched_entity *a,
|
||||||
struct sched_entity *b)
|
struct sched_entity *b)
|
||||||
{
|
{
|
||||||
return (s64)(a->vruntime - b->vruntime) < 0;
|
return (s64)(a->vruntime - b->vruntime) < 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define __node_2_se(node) \
|
||||||
|
rb_entry((node), struct sched_entity, run_node)
|
||||||
|
|
||||||
static void update_min_vruntime(struct cfs_rq *cfs_rq)
|
static void update_min_vruntime(struct cfs_rq *cfs_rq)
|
||||||
{
|
{
|
||||||
struct sched_entity *curr = cfs_rq->curr;
|
struct sched_entity *curr = cfs_rq->curr;
|
||||||
|
@ -552,8 +555,7 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leftmost) { /* non-empty tree */
|
if (leftmost) { /* non-empty tree */
|
||||||
struct sched_entity *se;
|
struct sched_entity *se = __node_2_se(leftmost);
|
||||||
se = rb_entry(leftmost, struct sched_entity, run_node);
|
|
||||||
|
|
||||||
if (!curr)
|
if (!curr)
|
||||||
vruntime = se->vruntime;
|
vruntime = se->vruntime;
|
||||||
|
@ -569,37 +571,17 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline bool __entity_less(struct rb_node *a, const struct rb_node *b)
|
||||||
|
{
|
||||||
|
return entity_before(__node_2_se(a), __node_2_se(b));
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Enqueue an entity into the rb-tree:
|
* Enqueue an entity into the rb-tree:
|
||||||
*/
|
*/
|
||||||
static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
|
static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
|
||||||
{
|
{
|
||||||
struct rb_node **link = &cfs_rq->tasks_timeline.rb_root.rb_node;
|
rb_add_cached(&se->run_node, &cfs_rq->tasks_timeline, __entity_less);
|
||||||
struct rb_node *parent = NULL;
|
|
||||||
struct sched_entity *entry;
|
|
||||||
bool leftmost = true;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Find the right place in the rbtree:
|
|
||||||
*/
|
|
||||||
while (*link) {
|
|
||||||
parent = *link;
|
|
||||||
entry = rb_entry(parent, struct sched_entity, run_node);
|
|
||||||
/*
|
|
||||||
* We dont care about collisions. Nodes with
|
|
||||||
* the same key stay together.
|
|
||||||
*/
|
|
||||||
if (entity_before(se, entry)) {
|
|
||||||
link = &parent->rb_left;
|
|
||||||
} else {
|
|
||||||
link = &parent->rb_right;
|
|
||||||
leftmost = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rb_link_node(&se->run_node, parent, link);
|
|
||||||
rb_insert_color_cached(&se->run_node,
|
|
||||||
&cfs_rq->tasks_timeline, leftmost);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
|
static void __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
|
||||||
|
@ -614,7 +596,7 @@ struct sched_entity *__pick_first_entity(struct cfs_rq *cfs_rq)
|
||||||
if (!left)
|
if (!left)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return rb_entry(left, struct sched_entity, run_node);
|
return __node_2_se(left);
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct sched_entity *__pick_next_entity(struct sched_entity *se)
|
static struct sched_entity *__pick_next_entity(struct sched_entity *se)
|
||||||
|
@ -624,7 +606,7 @@ static struct sched_entity *__pick_next_entity(struct sched_entity *se)
|
||||||
if (!next)
|
if (!next)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return rb_entry(next, struct sched_entity, run_node);
|
return __node_2_se(next);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_SCHED_DEBUG
|
#ifdef CONFIG_SCHED_DEBUG
|
||||||
|
@ -635,7 +617,7 @@ struct sched_entity *__pick_last_entity(struct cfs_rq *cfs_rq)
|
||||||
if (!last)
|
if (!last)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
return rb_entry(last, struct sched_entity, run_node);
|
return __node_2_se(last);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**************************************************************
|
/**************************************************************
|
||||||
|
|
Loading…
Reference in a new issue