diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/timer.c | 46 | ||||
| -rw-r--r-- | lib/timer.h | 42 |
2 files changed, 44 insertions, 44 deletions
diff --git a/lib/timer.c b/lib/timer.c index 338b0a1a..05e488c1 100644 --- a/lib/timer.c +++ b/lib/timer.c @@ -93,17 +93,17 @@ current_real_time(void) static void -tm2_free(resource *r) +tm_free(resource *r) { - timer2 *t = (timer2 *) r; + timer *t = (void *) r; - tm2_stop(t); + tm_stop(t); } static void -tm2_dump(resource *r) +tm_dump(resource *r) { - timer2 *t = (timer2 *) r; + timer *t = (void *) r; debug("(code %p, data %p, ", t->hook, t->data); if (t->randomize) @@ -117,25 +117,25 @@ tm2_dump(resource *r) } -static struct resclass tm2_class = { +static struct resclass tm_class = { "Timer", - sizeof(timer2), - tm2_free, - tm2_dump, + sizeof(timer), + tm_free, + tm_dump, NULL, NULL }; -timer2 * -tm2_new(pool *p) +timer * +tm_new(pool *p) { - timer2 *t = ralloc(p, &tm2_class); + timer *t = ralloc(p, &tm_class); t->index = -1; return t; } void -tm2_set(timer2 *t, btime when) +tm_set(timer *t, btime when) { struct timeloop *loop = timeloop_current(); uint tc = timers_count(loop); @@ -145,17 +145,17 @@ tm2_set(timer2 *t, btime when) t->index = ++tc; t->expires = when; BUFFER_PUSH(loop->timers) = t; - HEAP_INSERT(loop->timers.data, tc, timer2 *, TIMER_LESS, TIMER_SWAP); + HEAP_INSERT(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP); } else if (t->expires < when) { t->expires = when; - HEAP_INCREASE(loop->timers.data, tc, timer2 *, TIMER_LESS, TIMER_SWAP, t->index); + HEAP_INCREASE(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index); } else if (t->expires > when) { t->expires = when; - HEAP_DECREASE(loop->timers.data, tc, timer2 *, TIMER_LESS, TIMER_SWAP, t->index); + HEAP_DECREASE(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index); } #ifdef CONFIG_BFD @@ -166,13 +166,13 @@ tm2_set(timer2 *t, btime when) } void -tm2_start(timer2 *t, btime after) +tm_start(timer *t, btime after) { - tm2_set(t, current_time() + MAX(after, 0)); + tm_set(t, current_time() + MAX(after, 0)); } void -tm2_stop(timer2 *t) +tm_stop(timer *t) { if (!t->expires) return; @@ -180,7 +180,7 @@ tm2_stop(timer2 *t) struct timeloop *loop = timeloop_current(); uint tc = timers_count(loop); - HEAP_DELETE(loop->timers.data, tc, timer2 *, TIMER_LESS, TIMER_SWAP, t->index); + HEAP_DELETE(loop->timers.data, tc, timer *, TIMER_LESS, TIMER_SWAP, t->index); BUFFER_POP(loop->timers); t->index = -1; @@ -202,7 +202,7 @@ void timers_fire(struct timeloop *loop) { btime base_time; - timer2 *t; + timer *t; times_update(loop); base_time = loop->last_time; @@ -222,10 +222,10 @@ timers_fire(struct timeloop *loop) if (t->randomize) when += random() % (t->randomize + 1); - tm2_set(t, when); + tm_set(t, when); } else - tm2_stop(t); + tm_stop(t); /* This is ugly hack, we want to log just timers executed from the main I/O loop */ if (loop == &main_timeloop) diff --git a/lib/timer.h b/lib/timer.h index 250bb3cd..eeb7dcb7 100644 --- a/lib/timer.h +++ b/lib/timer.h @@ -7,18 +7,18 @@ * Can be freely distributed and used under the terms of the GNU GPL. */ -#ifndef _BIRD_TIMER2_H_ -#define _BIRD_TIMER2_H_ +#ifndef _BIRD_TIMER_H_ +#define _BIRD_TIMER_H_ #include "nest/bird.h" #include "lib/buffer.h" #include "lib/resource.h" -typedef struct timer2 +typedef struct timer { resource r; - void (*hook)(struct timer2 *); + void (*hook)(struct timer *); void *data; btime expires; /* 0=inactive */ @@ -26,11 +26,11 @@ typedef struct timer2 uint recurrent; /* Timer recurrence */ int index; -} timer2; +} timer; struct timeloop { - BUFFER(timer2 *) timers; + BUFFER(timer *) timers; btime last_time; btime real_time; }; @@ -38,7 +38,7 @@ struct timeloop static inline uint timers_count(struct timeloop *loop) { return loop->timers.used - 1; } -static inline timer2 *timers_first(struct timeloop *loop) +static inline timer *timers_first(struct timeloop *loop) { return (loop->timers.used > 1) ? loop->timers.data[1] : NULL; } extern struct timeloop main_timeloop; @@ -50,28 +50,28 @@ btime current_real_time(void); //#define now_real (current_real_time() TO_S) extern btime boot_time; -timer2 *tm2_new(pool *p); -void tm2_set(timer2 *t, btime when); -void tm2_start(timer2 *t, btime after); -void tm2_stop(timer2 *t); +timer *tm_new(pool *p); +void tm_set(timer *t, btime when); +void tm_start(timer *t, btime after); +void tm_stop(timer *t); static inline int -tm2_active(timer2 *t) +tm_active(timer *t) { return t->expires != 0; } static inline btime -tm2_remains(timer2 *t) +tm_remains(timer *t) { btime now_ = current_time(); return (t->expires > now_) ? (t->expires - now_) : 0; } -static inline timer2 * -tm2_new_init(pool *p, void (*hook)(struct timer2 *), void *data, uint rec, uint rand) +static inline timer * +tm_new_init(pool *p, void (*hook)(struct timer *), void *data, uint rec, uint rand) { - timer2 *t = tm2_new(p); + timer *t = tm_new(p); t->hook = hook; t->data = data; t->recurrent = rec; @@ -80,17 +80,17 @@ tm2_new_init(pool *p, void (*hook)(struct timer2 *), void *data, uint rec, uint } static inline void -tm2_set_max(timer2 *t, btime when) +tm_set_max(timer *t, btime when) { if (when > t->expires) - tm2_set(t, when); + tm_set(t, when); } static inline void -tm2_start_max(timer2 *t, btime after) +tm_start_max(timer *t, btime after) { - btime rem = tm2_remains(t); - tm2_start(t, MAX_(rem, after)); + btime rem = tm_remains(t); + tm_start(t, MAX_(rem, after)); } /* In sysdep code */ |