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.64 by root, Mon Jun 27 21:51:52 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)
… …
166 int fd = (uint32_t)ev->data.u64; /* mask out the lower 32 bits */ 168 int fd = (uint32_t)ev->data.u64; /* mask out the lower 32 bits */
167 int want = anfds [fd].events; 169 int want = anfds [fd].events;
168 int got = (ev->events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 170 int got = (ev->events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
169 | (ev->events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0); 171 | (ev->events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0);
170 172
173 /*
171 /* check for spurious notification */ 174 * check for spurious notification.
175 * this only finds spurious notifications on egen updates
176 * other spurious notifications will be found by epoll_ctl, below
172 /* we assume that fd is always in range, as we never shrink the anfds array */ 177 * we assume that fd is always in range, as we never shrink the anfds array
178 */
173 if (expect_false ((uint32_t)anfds [fd].egen != (uint32_t)(ev->data.u64 >> 32))) 179 if (expect_false ((uint32_t)anfds [fd].egen != (uint32_t)(ev->data.u64 >> 32)))
174 { 180 {
175 /* recreate kernel state */ 181 /* recreate kernel state */
176 postfork = 1; 182 postfork = 1;
177 continue; 183 continue;
… …
179 185
180 if (expect_false (got & ~want)) 186 if (expect_false (got & ~want))
181 { 187 {
182 anfds [fd].emask = want; 188 anfds [fd].emask = want;
183 189
190 /*
184 /* we received an event but are not interested in it, try mod or del */ 191 * we received an event but are not interested in it, try mod or del
185 /* I don't think we ever need MOD, but let's handle it anyways */ 192 * this often happens because we optimistically do not unregister fds
193 * when we are no longer interested in them, but also when we get spurious
194 * notifications for fds from another process. this is partially handled
195 * above with the gencounter check (== our fd is not the event fd), and
196 * partially here, when epoll_ctl returns an error (== a child has the fd
197 * but we closed it).
198 */
186 ev->events = (want & EV_READ ? EPOLLIN : 0) 199 ev->events = (want & EV_READ ? EPOLLIN : 0)
187 | (want & EV_WRITE ? EPOLLOUT : 0); 200 | (want & EV_WRITE ? EPOLLOUT : 0);
188 201
189 /* pre-2.6.9 kernels require a non-null pointer with EPOLL_CTL_DEL, */ 202 /* pre-2.6.9 kernels require a non-null pointer with EPOLL_CTL_DEL, */
190 /* which is fortunately easy to do for us. */ 203 /* which is fortunately easy to do for us. */
… …
232 if (backend_fd < 0) 245 if (backend_fd < 0)
233 return 0; 246 return 0;
234 247
235 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); 248 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
236 249
237 backend_fudge = 1./1024.; /* epoll does sometimes return early, this is just to avoid the worst */ 250 backend_mintime = 1./1024.; /* epoll does sometimes return early, this is just to avoid the worst */
238 backend_modify = epoll_modify; 251 backend_modify = epoll_modify;
239 backend_poll = epoll_poll; 252 backend_poll = epoll_poll;
240 253
241 epoll_eventmax = 64; /* initial number of events receivable per poll */ 254 epoll_eventmax = 64; /* initial number of events receivable per poll */
242 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax); 255 epoll_events = (struct epoll_event *)ev_malloc (sizeof (struct epoll_event) * epoll_eventmax);
243 256
244 return EVBACKEND_EPOLL; 257 return EVBACKEND_EPOLL;

Diff Legend

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