X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftimer%2Ftimer.c;fp=ccan%2Ftimer%2Ftimer.c;h=4e0b7101cc0df6a8c4ce7a75bfbc4e5b71e86ba5;hp=f0e017ba6ed8decba4ac4abcf0ecce07f01abf48;hb=08dac1288246b1fc9efe1695fe4c7575103e4a2b;hpb=bd9a48e7ffca063e21d580e9e0d94b1691c03687

diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c
index f0e017ba..4e0b7101 100644
--- a/ccan/timer/timer.c
+++ b/ccan/timer/timer.c
@@ -180,6 +180,10 @@ next:
 	if (i == PER_LEVEL) {
 		level++;
 		base >>= TIMER_LEVEL_BITS;
+		if (off != 0)
+			/* We need *next* bucket: we've started reusing the
+			 * one above */
+			base++;
 		goto next;
 	}
 
@@ -189,14 +193,23 @@ next:
 	else
 		found = find_first(h, NULL);
 
-	if (need_next) {
+	while (need_next) {
+		need_next = false;
 		if (!timers->level[level+1]) {
 			found = find_first(&timers->far, found);
 		} else {
+			/* Current upper bucket has emptied into this
+			 * bucket; we want *next* one. */
 			base >>= TIMER_LEVEL_BITS;
+			base++;
 			off = base % PER_LEVEL;
-			h = &timers->level[level+1]->list[off];
-			found = find_first(h, found);
+
+			if (off == 0) {
+				need_next = true;
+			} else {
+				h = &timers->level[level+1]->list[off];
+				found = find_first(h, found);
+			}
 		}
 	}
 	return found;