X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftimer%2Ftimer.c;h=ef6b27742679f4cbccc006d1db81d4cc83ec09fa;hb=48b4ffc38ecef0d423a09967e6784adb5807033a;hp=2685d3efde96f780fbbc3dc946d6acc4b9def9e1;hpb=fe328d06ed6df8d5a92eaab4be2d645affeeb99e;p=ccan

diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c
index 2685d3ef..ef6b2774 100644
--- a/ccan/timer/timer.c
+++ b/ccan/timer/timer.c
@@ -97,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;
 }
@@ -108,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;
 
@@ -346,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))