Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into int-new

Browse source
This commit is contained in:
Ondrej Zajicek (work) 2017-05-18 14:28:03 +02:00
commit 5a9169e152
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sysdep/unix/timer.h
View file

@ -19,14 +19,14 @@ typedef struct timer {
resource r; resource r;
void (*hook)(struct timer *); void (*hook)(struct timer *);
void *data; void *data;
unsigned randomize; /* Amount of randomization */ uint randomize; /* Amount of randomization */
unsigned recurrent; /* Timer recurrence */ uint recurrent; /* Timer recurrence */
node n; /* Internal link */ node n; /* Internal link */
bird_clock_t expires; /* 0=inactive */ bird_clock_t expires; /* 0=inactive */
} timer; } timer;
timer *tm_new(pool *); timer *tm_new(pool *);
void tm_start(timer *, unsigned after); void tm_start(timer *, uint after);
void tm_stop(timer *); void tm_stop(timer *);
void tm_dump_all(void); void tm_dump_all(void);
@ -47,14 +47,14 @@ tm_remains(timer *t)
} }
static inline void static inline void
tm_start_max(timer *t, unsigned after) tm_start_max(timer *t, bird_clock_t after)
{ {
bird_clock_t rem = tm_remains(t); bird_clock_t rem = tm_remains(t);
tm_start(t, (rem > after) ? rem : after); tm_start(t, (rem > after) ? rem : after);
} }
static inline timer * static inline timer *
tm_new_set(pool *p, void (*hook)(struct timer *), void *data, unsigned rand, unsigned rec) tm_new_set(pool *p, void (*hook)(struct timer *), void *data, uint rand, uint rec)
{ {
timer *t = tm_new(p); timer *t = tm_new(p);
t->hook = hook; t->hook = hook;