X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftimer%2Ftimer.c;h=0abf05cd419ee8111312450872e80b53fee1ebb2;hb=158691ae36fe1da78ec54dbcc0006f603398dae2;hp=59d1ff377cb6498e01ffbed8cad1ef4290466fdf;hpb=a40fc5a89e5336f405b84387d387c9f5a74e95fa;p=ccan diff --git a/ccan/timer/timer.c b/ccan/timer/timer.c index 59d1ff37..0abf05cd 100644 --- a/ccan/timer/timer.c +++ b/ccan/timer/timer.c @@ -12,23 +12,23 @@ struct timer_level { struct list_head list[PER_LEVEL]; }; -static uint64_t time_to_grains(struct timespec ts) +static uint64_t time_to_grains(struct timeabs t) { - return ts.tv_sec * ((uint64_t)1000000000 / TIMER_GRANULARITY) - + (ts.tv_nsec / TIMER_GRANULARITY); + return t.ts.tv_sec * ((uint64_t)1000000000 / TIMER_GRANULARITY) + + (t.ts.tv_nsec / TIMER_GRANULARITY); } -static struct timespec grains_to_time(uint64_t grains) +static struct timeabs grains_to_time(uint64_t grains) { - struct timespec ts; + struct timeabs t; - ts.tv_sec = grains / (1000000000 / TIMER_GRANULARITY); - ts.tv_nsec = (grains % (1000000000 / TIMER_GRANULARITY)) + t.ts.tv_sec = grains / (1000000000 / TIMER_GRANULARITY); + t.ts.tv_nsec = (grains % (1000000000 / TIMER_GRANULARITY)) * TIMER_GRANULARITY; - return ts; + return t; } -void timers_init(struct timers *timers, struct timespec start) +void timers_init(struct timers *timers, struct timeabs start) { unsigned int i; @@ -63,8 +63,20 @@ static void timer_add_raw(struct timers *timers, struct timer *t) list_add_tail(l, &t->list); } -void timer_add(struct timers *timers, struct timer *t, struct timespec when) +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. */ @@ -79,7 +91,7 @@ void timer_add(struct timers *timers, struct timer *t, struct timespec when) /* 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, @@ -119,41 +131,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) { @@ -238,7 +215,7 @@ static bool update_first(struct timers *timers) return true; } -bool timer_earliest(struct timers *timers, struct timespec *first) +bool timer_earliest(struct timers *timers, struct timeabs *first) { if (!update_first(timers)) return false; @@ -294,37 +271,37 @@ static void timer_fast_forward(struct timers *timers, uint64_t time) timer_add_raw(timers, i); } -/* Fills list of expired timers. */ -void timers_expire(struct timers *timers, - struct timespec expire, - struct list_head *list) +/* Returns an expired timer. */ +struct timer *timers_expire(struct timers *timers, struct timeabs expire) { uint64_t now = time_to_grains(expire); unsigned int off; + struct timer *t; assert(now >= timers->base); - list_head_init(list); - if (!timers->level[0]) { if (list_empty(&timers->far)) - return; + return NULL; add_level(timers, 0); } do { if (timers->first > now) { timer_fast_forward(timers, now); - break; + return NULL; } timer_fast_forward(timers, timers->first); off = timers->base % PER_LEVEL; - list_append_list(list, &timers->level[0]->list[off]); - if (timers->base == now) - break; - } while (update_first(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; } static bool timer_list_check(const struct list_head *l, @@ -341,7 +318,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 +328,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 +388,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 +434,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) {