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.63 by root, Sat Jun 4 05:33:29 2011 UTC vs.
Revision 1.67 by root, Wed Jun 20 12:39:53 2012 UTC

… …
168 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 */
169 int want = anfds [fd].events; 169 int want = anfds [fd].events;
170 int got = (ev->events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0) 170 int got = (ev->events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
171 | (ev->events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0); 171 | (ev->events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0);
172 172
173 /*
173 /* 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
174 /* 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 */
175 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)))
176 { 180 {
177 /* recreate kernel state */ 181 /* recreate kernel state */
178 postfork = 1; 182 postfork = 1;
179 continue; 183 continue;
… …
181 185
182 if (expect_false (got & ~want)) 186 if (expect_false (got & ~want))
183 { 187 {
184 anfds [fd].emask = want; 188 anfds [fd].emask = want;
185 189
190 /*
186 /* 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
187 /* 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 */
188 ev->events = (want & EV_READ ? EPOLLIN : 0) 199 ev->events = (want & EV_READ ? EPOLLIN : 0)
189 | (want & EV_WRITE ? EPOLLOUT : 0); 200 | (want & EV_WRITE ? EPOLLOUT : 0);
190 201
191 /* 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, */
192 /* which is fortunately easy to do for us. */ 203 /* which is fortunately easy to do for us. */
… …
225epoll_init (EV_P_ int flags) 236epoll_init (EV_P_ int flags)
226{ 237{
227#ifdef EPOLL_CLOEXEC 238#ifdef EPOLL_CLOEXEC
228 backend_fd = epoll_create1 (EPOLL_CLOEXEC); 239 backend_fd = epoll_create1 (EPOLL_CLOEXEC);
229 240
230 if (backend_fd <= 0) 241 if (backend_fd < 0 && (errno == EINVAL || errno == ENOSYS))
231#endif 242#endif
232 backend_fd = epoll_create (256); 243 backend_fd = epoll_create (256);
233 244
234 if (backend_fd < 0) 245 if (backend_fd < 0)
235 return 0; 246 return 0;
236 247
237 fcntl (backend_fd, F_SETFD, FD_CLOEXEC); 248 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
238 249
239 backend_mintime = 1./1024.; /* epoll does sometimes return early, this is just to avoid the worst */ 250 backend_mintime = 1e-3; /* epoll does sometimes return early, this is just to avoid the worst */
240 backend_modify = epoll_modify; 251 backend_modify = epoll_modify;
241 backend_poll = epoll_poll; 252 backend_poll = epoll_poll;
242 253
243 epoll_eventmax = 64; /* initial number of events receivable per poll */ 254 epoll_eventmax = 64; /* initial number of events receivable per poll */
244 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);

Diff Legend

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