Perf timer

src/event/xdbd_timer.c

@@ -5,34 +5,40 @@
 
 #include <xdbd_timer.h>
 
-BFDEV_RB_ROOT_CACHED(xdbd_timers);
+BFDEV_HEAP_ROOT(xdbd_timers);
 
 static inline long
-timer_cmp(const bfdev_rb_node_t *key1, const bfdev_rb_node_t *key2, void *pdata)
+timer_cmp(const bfdev_heap_node_t *key1, const bfdev_heap_node_t *key2, void *pdata)
 {
     xdbd_timer_t *node1, *node2;
 
-    node1 = bfdev_container_of(key1, xdbd_timer_t, rb);
-    node2 = bfdev_container_of(key2, xdbd_timer_t, rb);
+    node1 = bfdev_heap_entry(key1, xdbd_timer_t, node);
+    node2 = bfdev_heap_entry(key2, xdbd_timer_t, node);
 
     /* Ignoring conflicts */
-    return node1->time < node2->time ? BFDEV_LT : BFDEV_BT;
+    return bfdev_cmp(node1->time > node2->time);
 }
 
 xdbd_timer_t *
 xdbd_first_timer(void)
 {
-    return bfdev_rb_cached_first_entry(&xdbd_timers, xdbd_timer_t, rb);
+    bfdev_heap_node_t *node;
+    xdbd_timer_t *timer;
+
+    node = BFDEV_HEAP_ROOT_NODE(&xdbd_timers);
+    timer = bfdev_heap_entry(node, xdbd_timer_t, node);
+
+    return timer;
 }
 
 void
 xdbd_add_timer(xdbd_timer_t *timer)
 {
-    bfdev_rb_cached_insert(&xdbd_timers, &timer->rb, timer_cmp, NULL);
+    bfdev_heap_insert(&xdbd_timers, &timer->node, timer_cmp, NULL);
 }
 
 void
 xdbd_remove_timer(xdbd_timer_t *timer)
 {
-    bfdev_rb_cached_remove(&xdbd_timers, &timer->rb);
+    bfdev_heap_remove(&xdbd_timers, &timer->node);
 }

src/event/xdbd_timer.h

@@ -10,11 +10,12 @@
 #include <bfdev.h>
 
 struct xdbd_timer_s {
-    bfdev_rb_node_t rb;
+    bfdev_heap_node_t node;
     xdbd_msec_t time;
 };
 
-extern bfdev_rb_root_cached_t xdbd_timers;
+extern bfdev_heap_root_t
+xdbd_timers;
 
 extern xdbd_timer_t *
 xdbd_first_timer(void);