diff options
| author | Richard Nyberg <rnyberg@murmeldjur.se> | 2009-01-29 16:29:45 +0100 |
|---|---|---|
| committer | Richard Nyberg <rnyberg@murmeldjur.se> | 2009-01-29 16:29:45 +0100 |
| commit | c6f129faf70cb143e713e1fc606ce1fd2ce46034 (patch) | |
| tree | 305c32ab7cd0e9f2612e1518b3a2cc43a86b4acc /evloop | |
| parent | 3b7dcfa964da8de2d36e566fb6bf1f8201e9ad25 (diff) | |
| download | btpd-c6f129faf70cb143e713e1fc606ce1fd2ce46034.tar.gz btpd-c6f129faf70cb143e713e1fc606ce1fd2ce46034.zip | |
Rename timer* to evtimer*.
Diffstat (limited to 'evloop')
| -rw-r--r-- | evloop/epoll.c | 4 | ||||
| -rw-r--r-- | evloop/evloop.h | 10 | ||||
| -rw-r--r-- | evloop/kqueue.c | 4 | ||||
| -rw-r--r-- | evloop/poll.c | 4 | ||||
| -rw-r--r-- | evloop/timer.c | 10 |
5 files changed, 16 insertions, 16 deletions
diff --git a/evloop/epoll.c b/evloop/epoll.c index 5152194..824d142 100644 --- a/evloop/epoll.c +++ b/evloop/epoll.c @@ -84,8 +84,8 @@ evloop(void) int nev, i, millisecs; struct timespec delay; while (1) { - timers_run(); - delay = timer_delay(); + evtimers_run(); + delay = evtimer_delay(); if (delay.tv_sec >= 0) millisecs = delay.tv_sec * 1000 + delay.tv_nsec / 1000000; else diff --git a/evloop/evloop.h b/evloop/evloop.h index 97f7665..55589aa 100644 --- a/evloop/evloop.h +++ b/evloop/evloop.h @@ -47,11 +47,11 @@ int fdev_del(struct fdev *ev); int fdev_enable(struct fdev *ev, uint16_t flags); int fdev_disable(struct fdev *ev, uint16_t flags); -void timer_init(struct timeout *, evloop_cb_t, void *); -int timer_add(struct timeout *, struct timespec *); -void timer_del(struct timeout *); +void evtimer_init(struct timeout *, evloop_cb_t, void *); +int evtimer_add(struct timeout *, struct timespec *); +void evtimer_del(struct timeout *); -void timers_run(void); -struct timespec timer_delay(void); +void evtimers_run(void); +struct timespec evtimer_delay(void); #endif diff --git a/evloop/kqueue.c b/evloop/kqueue.c index 7f323db..649e838 100644 --- a/evloop/kqueue.c +++ b/evloop/kqueue.c @@ -89,8 +89,8 @@ evloop(void) int nev, i; struct timespec delay; while (1) { - timers_run(); - delay = timer_delay(); + evtimers_run(); + delay = evtimer_delay(); if ((nev = kevent(m_kq, NULL, 0, m_evs, 100, &delay)) < 0) { if (errno == EINTR) diff --git a/evloop/poll.c b/evloop/poll.c index 0996374..157cfa1 100644 --- a/evloop/poll.c +++ b/evloop/poll.c @@ -107,9 +107,9 @@ evloop(void) int millisecs; struct timespec delay; while (1) { - timers_run(); + evtimers_run(); - delay = timer_delay(); + delay = evtimer_delay(); if (delay.tv_sec >= 0) millisecs = delay.tv_sec * 1000 + delay.tv_nsec / 1000000; else diff --git a/evloop/timer.c b/evloop/timer.c index 3ef3091..3174c08 100644 --- a/evloop/timer.c +++ b/evloop/timer.c @@ -38,7 +38,7 @@ subtime(struct timespec a, struct timespec b) } void -timer_init(struct timeout *h, evloop_cb_t cb, void *arg) +evtimer_init(struct timeout *h, evloop_cb_t cb, void *arg) { h->cb = cb; h->arg = arg; @@ -47,7 +47,7 @@ timer_init(struct timeout *h, evloop_cb_t cb, void *arg) } int -timer_add(struct timeout *h, struct timespec *t) +evtimer_add(struct timeout *h, struct timespec *t) { struct timespec now, sum; clock_gettime(TIMER_CLOCK, &now); @@ -61,7 +61,7 @@ timer_add(struct timeout *h, struct timespec *t) } void -timer_del(struct timeout *h) +evtimer_del(struct timeout *h) { if (h->th.i >= 0) { timeheap_remove(&h->th); @@ -70,7 +70,7 @@ timer_del(struct timeout *h) } void -timers_run(void) +evtimers_run(void) { struct timespec now; clock_gettime(TIMER_CLOCK, &now); @@ -86,7 +86,7 @@ timers_run(void) } struct timespec -timer_delay(void) +evtimer_delay(void) { struct timespec now, diff; if (timeheap_size() == 0) { |