X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftimer%2Ftimer.c;h=cf3bfd9d1edada106c9c5d0e24126e83a7a47e5c;hp=59d1ff377cb6498e01ffbed8cad1ef4290466fdf;hb=8f6c40bce722642ff7e253a675b8ce6cd7e7a091;hpb=a40fc5a89e5336f405b84387d387c9f5a74e95fa

diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c
index 59d1ff37..cf3bfd9d 100644
--- a/ccan/timer/timer.c
+++ b/ccan/timer/timer.c
@@ -119,41 +119,6 @@ static void add_level(struct timers *timers, unsigned int level)
 		timer_add_raw(timers, t);
 }
 
-/* Take timers from level and distribute them down one. */
-static void cascade(struct timers *timers, unsigned int level)
-{
-	struct timer *i;
-	struct list_head from_far, *list;
-
-	if (level == ARRAY_SIZE(timers->level) || !timers->level[level]) {
-		list_head_init(&from_far);
-		timers_far_get(timers, &from_far,
-			       timers->base
-			       + (1ULL << (level*TIMER_LEVEL_BITS))-1);
-		list = &from_far;
-		if (level != ARRAY_SIZE(timers->level))
-			add_level(timers, level);
-	} else {
-		unsigned src;
-
-		src = (timers->base >> (level * TIMER_LEVEL_BITS)) % PER_LEVEL;
-		if (src == 0)
-			cascade(timers, level + 1);
-		list = &timers->level[level]->list[src];
-	}
-
-	while ((i = list_pop(list, struct timer, list)) != NULL) {
-		unsigned dst;
-
-		assert(i->time >= timers->base);
-		assert(i->time < (timers->base
-				  + (1ULL << ((level+1)*TIMER_LEVEL_BITS))));
-
-		dst = (i->time >> ((level-1)*TIMER_LEVEL_BITS)) % PER_LEVEL;
-		list_add_tail(&timers->level[level-1]->list[dst], &i->list);
-	}
-}
-
 static const struct timer *find_first(const struct list_head *list,
 				      const struct timer *prev)
 {
@@ -341,7 +306,8 @@ static bool timer_list_check(const struct list_head *l,
 			if (abortstr) {
 				fprintf(stderr,
 					"%s: timer %p %llu not %llu-%llu\n",
-					abortstr, t, t->time, min, max);
+					abortstr, t, (long long)t->time,
+					(long long)min, (long long)max);
 				abort();
 			}
 			return false;
@@ -350,7 +316,8 @@ static bool timer_list_check(const struct list_head *l,
 			if (abortstr) {
 				fprintf(stderr,
 					"%s: timer %p %llu < minimum %llu\n",
-					abortstr, t, t->time, first);
+					abortstr, t, (long long)t->time,
+					(long long)first);
 				abort();
 			}
 			return false;
@@ -409,7 +376,7 @@ past_levels:
 	return (struct timers *)timers;
 }
 
-//#ifdef CCAN_TIMER_DEBUG
+#ifdef CCAN_TIMER_DEBUG
 void timers_dump(const struct timers *timers, FILE *fp)
 {
 	unsigned int l, i;
@@ -455,7 +422,7 @@ void timers_dump(const struct timers *timers, FILE *fp)
 	}
 	fprintf(stderr, "Far: %llu (%llu-%llu)\n", num, min, max);
 }
-//#endif
+#endif
 
 void timers_cleanup(struct timers *timers)
 {