X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftimer%2Ftimer.c;h=ef6b27742679f4cbccc006d1db81d4cc83ec09fa;hb=48b4ffc38ecef0d423a09967e6784adb5807033a;hp=607415620c6223d9620d70606d851c70da00af74;hpb=23e72d4194172b52d26fed9f36c7af9b893f4649;p=ccan diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c index 60741562..ef6b2774 100644 --- a/ccan/timer/timer.c +++ b/ccan/timer/timer.c @@ -11,23 +11,21 @@ struct timer_level { struct list_head list[PER_LEVEL]; }; -static void *timer_default_alloc(size_t len, void *arg) +static void *timer_default_alloc(struct timers *timers, size_t len) { return malloc(len); } -static void timer_default_free(const void *p, void *arg) +static void timer_default_free(struct timers *timers, void *p) { - free((void *)p); + free(p); } -static void *(*timer_alloc)(size_t, void *) = timer_default_alloc; -static void (*timer_free)(const void *, void *) = timer_default_free; -static void *timer_arg; +static void *(*timer_alloc)(struct timers *, size_t) = timer_default_alloc; +static void (*timer_free)(struct timers *, void *) = timer_default_free; -void timers_set_allocator(void *(*alloc)(size_t len, void *arg), - void (*free)(const void *p, void *arg), - void *arg) +void timers_set_allocator(void *(*alloc)(struct timers *, size_t len), + void (*free)(struct timers *, void *p)) { if (!alloc) alloc = timer_default_alloc; @@ -35,7 +33,6 @@ void timers_set_allocator(void *(*alloc)(size_t len, void *arg), free = timer_default_free; timer_alloc = alloc; timer_free = free; - timer_arg = arg; } static uint64_t time_to_grains(struct timemono t) @@ -100,7 +97,7 @@ void timer_init(struct timer *t) list_node_init(&t->list); } -static bool list_node_initted(const struct list_node *n) +static inline bool list_node_initted(const struct list_node *n) { return n->prev == n; } @@ -111,13 +108,10 @@ void timer_addrel(struct timers *timers, struct timer *t, struct timerel rel) t->time = time_to_grains(timemono_add(time_mono(), rel)); -#if TIME_HAVE_MONOTONIC - assert(t->time >= timers->base); -#else /* Added in the past? Treat it as imminent. */ if (t->time < timers->base) t->time = timers->base; -#endif + if (t->time < timers->first) timers->first = t->time; @@ -166,7 +160,7 @@ static void add_level(struct timers *timers, unsigned int level) unsigned int i; struct list_head from_far; - l = timer_alloc(sizeof(*l), timer_arg); + l = timer_alloc(timers, sizeof(*l)); if (!l) return; @@ -349,7 +343,11 @@ struct timer *timers_expire(struct timers *timers, struct timemono expire) unsigned int off; struct timer *t; - assert(now >= timers->base); + /* This can happen without TIME_HAVE_MONOTONIC, but I also have + * a report of OpenBSD 6.8 under virtualbox doing this. */ + if (now < timers->base) { + return NULL; + } if (!timers->level[0]) { if (list_empty(&timers->far)) @@ -547,5 +545,5 @@ void timers_cleanup(struct timers *timers) unsigned int l; for (l = 0; l < ARRAY_SIZE(timers->level); l++) - timer_free(timers->level[l], timer_arg); + timer_free(timers, timers->level[l]); }