shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-07 09:56:51 +03:00
Code

event: make sure to possibly disarm the timerfds before we reenter epoll_wait

Browse Source
This commit is contained in:
Lennart Poettering 2013-11-20 18:20:23 +01:00
parent c57b5ca301
commit 1b5995b039
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd-bus/sd-event.c
View File

@ -1756,10 +1756,6 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
if (r < 0) if (r < 0)
goto finish; goto finish;
if (event_next_pending(e) || e->need_process_child)
timeout = 0;
if (timeout > 0) {
r = event_arm_timer(e, e->monotonic_fd, e->monotonic_earliest, e->monotonic_latest, &e->monotonic_next); r = event_arm_timer(e, e->monotonic_fd, e->monotonic_earliest, e->monotonic_latest, &e->monotonic_next);
if (r < 0) if (r < 0)
goto finish; goto finish;
@ -1767,7 +1763,9 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
r = event_arm_timer(e, e->realtime_fd, e->realtime_earliest, e->realtime_latest, &e->realtime_next); r = event_arm_timer(e, e->realtime_fd, e->realtime_earliest, e->realtime_latest, &e->realtime_next);
if (r < 0) if (r < 0)
goto finish; goto finish;
}
if (event_next_pending(e) || e->need_process_child)
timeout = 0;
m = epoll_wait(e->epoll_fd, ev_queue, EPOLL_QUEUE_MAX, m = epoll_wait(e->epoll_fd, ev_queue, EPOLL_QUEUE_MAX,
timeout == (uint64_t) -1 ? -1 : (int) ((timeout + USEC_PER_MSEC - 1) / USEC_PER_MSEC)); timeout == (uint64_t) -1 ? -1 : (int) ((timeout + USEC_PER_MSEC - 1) / USEC_PER_MSEC));