summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <koverstreet@google.com>2012-05-23 16:45:24 -0700
committerKent Overstreet <koverstreet@google.com>2012-05-23 16:49:10 -0700
commit9b6e57451ad5a5b95f472418a2ee69842b1ec926 (patch)
treee27df407426a9306af650f65011045de850376c4
parent6fdf802540d26fec552ce1a824bed3676c28fb76 (diff)
timerqueue: convert to generic rb tree code
Change-Id: Ib31c42c037203b7eb78515673475130db9fa6b0b
-rw-r--r--lib/timerqueue.c23
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/timerqueue.c b/lib/timerqueue.c
index a382e4a32609..3014abea1811 100644
--- a/lib/timerqueue.c
+++ b/lib/timerqueue.c
@@ -27,6 +27,14 @@
#include <linux/rbtree.h>
#include <linux/export.h>
+static int timerqueue_cmp(struct rb_node *l, struct rb_node *r)
+{
+ return clamp_t(int64_t,
+ rb_entry(l, struct timerqueue_node, node)->expires.tv64 -
+ rb_entry(r, struct timerqueue_node, node)->expires.tv64,
+ -1, 1);
+}
+
/**
* timerqueue_add - Adds timer to timerqueue.
*
@@ -38,23 +46,10 @@
*/
void timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node)
{
- struct rb_node **p = &head->head.rb_node;
- struct rb_node *parent = NULL;
- struct timerqueue_node *ptr;
-
/* Make sure we don't add nodes that are already added */
WARN_ON_ONCE(!RB_EMPTY_NODE(&node->node));
- while (*p) {
- parent = *p;
- ptr = rb_entry(parent, struct timerqueue_node, node);
- if (node->expires.tv64 < ptr->expires.tv64)
- p = &(*p)->rb_left;
- else
- p = &(*p)->rb_right;
- }
- rb_link_node(&node->node, parent, p);
- rb_insert_color(&node->node, &head->head);
+ rb_insert_allow_dup(&head->head, &node->node, timerqueue_cmp);
if (!head->next || node->expires.tv64 < head->next->expires.tv64)
head->next = node;