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.73 by root, Thu Jun 20 22:44:59 2019 UTC vs.
Revision 1.76 by root, Wed Jun 26 00:01:46 2019 UTC

… …
128 epoll_eperms [epoll_epermcnt++] = fd; 128 epoll_eperms [epoll_epermcnt++] = fd;
129 } 129 }
130 130
131 return; 131 return;
132 } 132 }
133 else
134 assert (("libev: I/O watcher with invalid fd found in epoll_ctl", errno != EBADF && errno != ELOOP && errno != EINVAL));
133 135
134 fd_kill (EV_A_ fd); 136 fd_kill (EV_A_ fd);
135 137
136dec_egen: 138dec_egen:
137 /* we didn't successfully call epoll_ctl, so decrement the generation counter again */ 139 /* we didn't successfully call epoll_ctl, so decrement the generation counter again */
… …
233 anfds [fd].emask = 0; 235 anfds [fd].emask = 0;
234 } 236 }
235 } 237 }
236} 238}
237 239
240static int
241epoll_epoll_create (void)
242{
243 int fd;
244
245#if defined EPOLL_CLOEXEC && !defined __ANDROID__
246 fd = epoll_create1 (EPOLL_CLOEXEC);
247
248 if (fd < 0 && (errno == EINVAL || errno == ENOSYS))
249#endif
250 {
251 fd = epoll_create (256);
252
253 if (fd >= 0)
254 fcntl (fd, F_SETFD, FD_CLOEXEC);
255 }
256
257 return fd;
258}
259
238inline_size 260inline_size
239int 261int
240epoll_init (EV_P_ int flags) 262epoll_init (EV_P_ int flags)
241{ 263{
242#if defined EPOLL_CLOEXEC && !defined __ANDROID__ 264 if ((backend_fd = epoll_epoll_create ()) < 0)
243 backend_fd = epoll_create1 (EPOLL_CLOEXEC);
244
245 if (backend_fd < 0 && (errno == EINVAL || errno == ENOSYS))
246#endif
247 backend_fd = epoll_create (256);
248
249 if (backend_fd < 0)
250 return 0; 265 return 0;
251
252 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
253 266
254 backend_mintime = 1e-3; /* epoll does sometimes return early, this is just to avoid the worst */ 267 backend_mintime = 1e-3; /* epoll does sometimes return early, this is just to avoid the worst */
255 backend_modify = epoll_modify; 268 backend_modify = epoll_modify;
256 backend_poll = epoll_poll; 269 backend_poll = epoll_poll;
257 270
… …
273void 286void
274epoll_fork (EV_P) 287epoll_fork (EV_P)
275{ 288{
276 close (backend_fd); 289 close (backend_fd);
277 290
278 while ((backend_fd = epoll_create (256)) < 0) 291 while ((backend_fd = epoll_epoll_create ()) < 0)
279 ev_syserr ("(libev) epoll_create"); 292 ev_syserr ("(libev) epoll_create");
280 293
281 fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
282
283 fd_rearm_all (EV_A); 294 fd_rearm_all (EV_A);
284} 295}
285 296

Diff Legend

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