GuillaumeHemmen/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 13:03:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

rbtree, timerqueue: Use rb_add_cached()

Browse source 
Reduce rbtree boiler plate by using the new helpers.

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:
Peter Zijlstra 2020-04-29 17:07:53 +02:00 committed by Ingo Molnar
parent 5a7987253e
commit 798172b137
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
lib/timerqueue.c
View file

@ -14,6 +14,14 @@
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include <linux/export.h> #include <linux/export.h>
#define __node_2_tq(_n) \
rb_entry((_n), struct timerqueue_node, node)
static inline bool __timerqueue_less(struct rb_node *a, const struct rb_node *b)
{
return __node_2_tq(a)->expires < __node_2_tq(b)->expires;
}
/** /**
* timerqueue_add - Adds timer to timerqueue. * timerqueue_add - Adds timer to timerqueue.
* *
@ -26,28 +34,10 @@
*/ */
bool timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node) bool timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node)
{ {
struct rb_node **p = &head->rb_root.rb_root.rb_node;
struct rb_node *parent = NULL;
struct timerqueue_node *ptr;
bool leftmost = true;
/* Make sure we don't add nodes that are already added */ /* Make sure we don't add nodes that are already added */
WARN_ON_ONCE(!RB_EMPTY_NODE(&node->node)); WARN_ON_ONCE(!RB_EMPTY_NODE(&node->node));
while (*p) { return rb_add_cached(&node->node, &head->rb_root, __timerqueue_less);
parent = *p;
ptr = rb_entry(parent, struct timerqueue_node, node);
if (node->expires < ptr->expires) {
p = &(*p)->rb_left;
} else {
p = &(*p)->rb_right;
leftmost = false;
}
}
rb_link_node(&node->node, parent, p);
rb_insert_color_cached(&node->node, &head->rb_root, leftmost);
return leftmost;
} }
EXPORT_SYMBOL_GPL(timerqueue_add); EXPORT_SYMBOL_GPL(timerqueue_add);