timer: fix timer_check() to iterate all levels.

[ccan] / ccan / timer / timer.c

diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c
index c30c6227ab9a7fc2b672e3319605d0d66ed3a35d..0d7deb127748b3130a1270f75ebc6ecec1fbf583 100644 (file)
--- a/ccan/timer/timer.c
+++ b/ccan/timer/timer.c
@@ -63,8 +63,20 @@ static void timer_add_raw(struct timers *timers, struct timer *t)
        list_add_tail(l, &t->list);
 }
 
+void timer_init(struct timer *t)
+{
+       list_node_init(&t->list);
+}
+
+static bool list_node_initted(const struct list_node *n)
+{
+       return n->prev == n;
+}
+
 void timer_add(struct timers *timers, struct timer *t, struct timeabs when)
 {
+       assert(list_node_initted(&t->list));
+
        t->time = time_to_grains(when);
 
        /* Added in the past?  Treat it as imminent. */
@@ -79,7 +91,7 @@ void timer_add(struct timers *timers, struct timer *t, struct timeabs when)
 /* FIXME: inline */
 void timer_del(struct timers *timers, struct timer *t)
 {
-       list_del(&t->list);
+       list_del_init(&t->list);
 }
 
 static void timers_far_get(struct timers *timers,
@@ -259,37 +271,37 @@ static void timer_fast_forward(struct timers *timers, uint64_t time)
                timer_add_raw(timers, i);
 }
 
-/* Fills list of expired timers. */
-void timers_expire(struct timers *timers,
-                  struct timeabs expire,
-                  struct list_head *list)
+/* Returns an expired timer. */
+struct timer *timers_expire(struct timers *timers, struct timeabs expire)
 {
        uint64_t now = time_to_grains(expire);
        unsigned int off;
+       struct timer *t;
 
        assert(now >= timers->base);
 
-       list_head_init(list);
-
        if (!timers->level[0]) {
                if (list_empty(&timers->far))
-                       return;
+                       return NULL;
                add_level(timers, 0);
        }
 
        do {
                if (timers->first > now) {
                        timer_fast_forward(timers, now);
-                       break;
+                       return NULL;
                }
 
                timer_fast_forward(timers, timers->first);
                off = timers->base % PER_LEVEL;
 
-               list_append_list(list, &timers->level[0]->list[off]);
-               if (timers->base == now)
-                       break;
-       } while (update_first(timers));
+               /* This *may* be NULL, if we deleted the first timer */
+               t = list_pop(&timers->level[0]->list[off], struct timer, list);
+               if (t)
+                       list_node_init(&t->list);
+       } while (!t && update_first(timers));
+
+       return t;
 }
 
 static bool timer_list_check(const struct list_head *l,
@@ -348,7 +360,7 @@ struct timers *timers_check(const struct timers *timers, const char *abortstr)
 
        /* For other levels, "current" bucket has been emptied, and may contain
         * entries for the current + level_size bucket. */
-       for (l = 1; timers->level[l] && l < PER_LEVEL; l++) {
+       for (l = 1; l < ARRAY_SIZE(timers->level) && timers->level[l]; l++) {
                uint64_t per_bucket = 1ULL << (TIMER_LEVEL_BITS * l);
 
                off = ((timers->base >> (l*TIMER_LEVEL_BITS)) % PER_LEVEL);