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. */
/* 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,
/* 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;
/* 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);