norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eloop: forward timer HUP and I/O errors to caller

Browse Source 
Similar to counter callbacks we now call timer callbacks with 0 as
argument on errors and disable the timer source.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-05-19 12:47:08 +02:00
parent c9fe031cb7
commit fb4b087bf2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/eloop.c
View File

@ -752,21 +752,34 @@ static void timer_cb(struct ev_fd *fd, int mask, void *data)
if (mask & (EV_HUP | EV_ERR)) {
log_warn("HUP/ERR on timer source");
if (timer->cb)
timer->cb(timer, 0, timer->data);
return;
}
if (mask & EV_READABLE) {
len = read(timer->fd, &expirations, sizeof(expirations));
if (len < 0) {
if (errno != EAGAIN)
if (errno != EAGAIN) {
log_warning("cannot read timerfd (%d): %m",
errno);
ev_timer_disable(timer);
if (timer->cb)
timer->cb(timer, 0, timer->data);
}
} else if (len == 0) {
log_warning("EOF on timer source");
ev_timer_disable(timer);
if (timer->cb)
timer->cb(timer, 0, timer->data);
} else if (len != sizeof(expirations)) {
log_warn("invalid size %d read on timerfd", len);
} else if (timer->cb) {
timer->cb(timer, expirations, timer->data);
ev_timer_disable(timer);
if (timer->cb)
timer->cb(timer, 0, timer->data);
} else if (expirations > 0) {
if (timer->cb)
timer->cb(timer, expirations, timer->data);
}
}
}