ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev_epoll.c
(Generate patch)

Comparing libev/ev_epoll.c (file contents):
Revision 1.61 by root, Thu Jun 2 23:34:05 2011 UTC vs.
Revision 1.62 by root, Sat Jun 4 05:25:03 2011 UTC

… …
142epoll_poll (EV_P_ ev_tstamp timeout) 142epoll_poll (EV_P_ ev_tstamp timeout)
143{ 143{
144 int i; 144 int i;
145 int eventcnt; 145 int eventcnt;
146 146
147 if (expect_false (epoll_epermcnt))
148 timeout = 0.;
149
147 /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */ 150 /* epoll wait times cannot be larger than (LONG_MAX - 999UL) / HZ msecs, which is below */
148 /* the default libev max wait time, however. */ 151 /* the default libev max wait time, however. */
149 EV_RELEASE_CB; 152 EV_RELEASE_CB;
150 eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, 153 eventcnt = epoll_wait (backend_fd, epoll_events, epoll_eventmax, timeout * 1e3);
151 epoll_epermcnt ? 0 : ev_timeout_to_ms (timeout));
152 EV_ACQUIRE_CB; 154 EV_ACQUIRE_CB;
153 155
154 if (expect_false (eventcnt < 0)) 156 if (expect_false (eventcnt < 0))
155 { 157 {
156 if (errno != EINTR) 158 if (errno != EINTR)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines