[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_epoll.c (file contents):
Revision 1.73 by root, Thu Jun 20 22:44:59 2019 UTC vs.
Revision 1.74 by root, Sun Jun 23 00:21:24 2019 UTC

           anfds [fd].emask = 0;
         }
     }
 }
+static int
+ev_epoll_create (void)
+{
+  int fd;
+#if defined EPOLL_CLOEXEC && !defined __ANDROID__
+  fd = epoll_create1 (EPOLL_CLOEXEC);
+  if (fd < 0 && (errno == EINVAL || errno == ENOSYS))
+#endif
+    {
+      fd = epoll_create (256);
+      if (fd >= 0)
+        fcntl (fd, F_SETFD, FD_CLOEXEC);
+    }
+  return fd;
+}
 inline_size
 int
 epoll_init (EV_P_ int flags)
 {
-#if defined EPOLL_CLOEXEC && !defined __ANDROID__
-  backend_fd = epoll_create1 (EPOLL_CLOEXEC);
-  if (backend_fd < 0 && (errno == EINVAL || errno == ENOSYS))
-#endif
-    backend_fd = epoll_create (256);
+  if ((backend_fd = ev_epoll_create ()) < 0)
-  if (backend_fd < 0)
     return 0;
-  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
   backend_mintime = 1e-3; /* epoll does sometimes return early, this is just to avoid the worst */
   backend_modify  = epoll_modify;
   backend_poll    = epoll_poll;
 void
 epoll_fork (EV_P)
 {
   close (backend_fd);
-  while ((backend_fd = epoll_create (256)) < 0)
+  while ((backend_fd = ev_epoll_create ()) < 0)
     ev_syserr ("(libev) epoll_create");
-  fcntl (backend_fd, F_SETFD, FD_CLOEXEC);
   fd_rearm_all (EV_A);
 }

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