更新至4.27

Author: CandyMi

Changes

@@ -1,8 +1,14 @@
 Revision history for libev, a high-performance and full-featured event loop.
 
+4.27 Thu Jun 27 22:43:44 CEST 2019
 	- linux aio backend almost complete rewritten to work around its
           limitations.
         - epoll backend now mandatory for linux aio backend.
+        - fail assertions more aggressively on invalid fd's detected
+          in the event loop, do not just silently fd_kill in case of
+          user error.
+        - ev_io_start/ev_io_stop now verify the watcher fd using
+          a syscall when EV_VERIFY is 2 or higher.
 
 4.26 (EV only)
 	- update to libecb 0x00010006.

config.h.in

@@ -30,6 +30,9 @@
 /* Define to 1 if you have the `rt' library (-lrt). */
 #undef HAVE_LIBRT
 
+/* Define to 1 if you have the <linux/aio_abi.h> header file. */
+#undef HAVE_LINUX_AIO_ABI_H
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

configure.ac

@@ -1,5 +1,5 @@
 dnl also update ev.h!
-AC_INIT([libev], [4.25])
+AC_INIT([libev], [4.27])
 
 orig_CFLAGS="$CFLAGS"
 

ev.3

@@ -293,9 +293,13 @@ it will print a diagnostic message and abort (via the \f(CW\*(C`assert\*(C'\fR m
 so \f(CW\*(C`NDEBUG\*(C'\fR will disable this checking): these are programming errors in
 the libev caller and need to be fixed there.
 .PP
-Libev also has a few internal error-checking \f(CW\*(C`assert\*(C'\fRions, and also has
-extensive consistency checking code. These do not trigger under normal
-circumstances, as they indicate either a bug in libev or worse.
+Via the \f(CW\*(C`EV_FREQUENT\*(C'\fR macro you can compile in and/or enable extensive
+consistency checking code inside libev that can be used to check for
+internal inconsistencies, suually caused by application bugs.
+.PP
+Libev also has a few internal error-checking \f(CW\*(C`assert\*(C'\fRions. These do not
+trigger under normal circumstances, as they indicate either a bug in libev
+or worse.
 .SH "GLOBAL FUNCTIONS"
 .IX Header "GLOBAL FUNCTIONS"
 These functions can be called anytime, even before initialising the
@@ -5084,6 +5088,9 @@ called once per loop, which can slow down libev. If set to \f(CW3\fR, then the
 verification code will be called very frequently, which will slow down
 libev considerably.
 .Sp
+Verification errors are reported via C's \f(CW\*(C`assert\*(C'\fR mechanism, so if you
+disable that (e.g. by defining \f(CW\*(C`NDEBUG\*(C'\fR) then no errors will be reported.
+.Sp
 The default is \f(CW1\fR, unless \f(CW\*(C`EV_FEATURES\*(C'\fR overrides it, in which case it
 will be \f(CW0\fR.
 .IP "\s-1EV_COMMON\s0" 4

ev.c

@@ -3751,7 +3751,6 @@ ev_run (EV_P_ int flags)
             ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
           }
 
-
         /* update ev_rt_now, do magic */
         time_update (EV_A_ waittime + sleeptime);
       }
@@ -3925,6 +3924,9 @@ ev_io_start (EV_P_ ev_io *w) EV_NOEXCEPT
   assert (("libev: ev_io_start called with negative fd", fd >= 0));
   assert (("libev: ev_io_start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
 
+#if EV_VERIFY >= 2
+  assert (("libev: ev_io_start called on watcher with invalid fd", fd_valid (fd)));
+#endif
   EV_FREQUENT_CHECK;
 
   ev_start (EV_A_ (W)w, 1);
@@ -3950,6 +3952,9 @@ ev_io_stop (EV_P_ ev_io *w) EV_NOEXCEPT
 
   assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
 
+#if EV_VERIFY >= 2
+  assert (("libev: ev_io_stop called on watcher with invalid fd", fd_valid (w->fd)));
+#endif
   EV_FREQUENT_CHECK;
 
   wlist_del (&anfds[w->fd].head, (WL)w);

ev.h

@@ -212,7 +212,7 @@ struct ev_loop;
 /*****************************************************************************/
 
 #define EV_VERSION_MAJOR 4
-#define EV_VERSION_MINOR 26
+#define EV_VERSION_MINOR 27
 
 /* eventmask, revents, events... */
 enum {

ev.pod

@@ -161,9 +161,13 @@ it will print a diagnostic message and abort (via the C<assert> mechanism,
 so C<NDEBUG> will disable this checking): these are programming errors in
 the libev caller and need to be fixed there.
 
-Libev also has a few internal error-checking C<assert>ions, and also has
-extensive consistency checking code. These do not trigger under normal
-circumstances, as they indicate either a bug in libev or worse.
+Via the C<EV_FREQUENT> macro you can compile in and/or enable extensive
+consistency checking code inside libev that can be used to check for
+internal inconsistencies, suually caused by application bugs.
+
+Libev also has a few internal error-checking C<assert>ions. These do not
+trigger under normal circumstances, as they indicate either a bug in libev
+or worse.
 
 
 =head1 GLOBAL FUNCTIONS
@@ -4975,6 +4979,9 @@ called once per loop, which can slow down libev. If set to C<3>, then the
 verification code will be called very frequently, which will slow down
 libev considerably.
 
+Verification errors are reported via C's C<assert> mechanism, so if you
+disable that (e.g. by defining C<NDEBUG>) then no errors will be reported.
+
 The default is C<1>, unless C<EV_FEATURES> overrides it, in which case it
 will be C<0>.
 

ev_epoll.c

@@ -130,6 +130,8 @@ epoll_modify (EV_P_ int fd, int oev, int nev)
 
       return;
     }
+  else
+    assert (("libev: I/O watcher with invalid fd found in epoll_ctl", errno != EBADF && errno != ELOOP && errno != EINVAL));
 
   fd_kill (EV_A_ fd);
 
@@ -236,7 +238,7 @@ epoll_poll (EV_P_ ev_tstamp timeout)
 }
 
 static int
-ev_epoll_create (void)
+epoll_epoll_create (void)
 {
   int fd;
 
@@ -259,7 +261,7 @@ inline_size
 int
 epoll_init (EV_P_ int flags)
 {
-  if ((backend_fd = ev_epoll_create ()) < 0)
+  if ((backend_fd = epoll_epoll_create ()) < 0)
     return 0;
 
   backend_mintime = 1e-3; /* epoll does sometimes return early, this is just to avoid the worst */
@@ -286,7 +288,7 @@ epoll_fork (EV_P)
 {
   close (backend_fd);
 
-  while ((backend_fd = ev_epoll_create ()) < 0)
+  while ((backend_fd = epoll_epoll_create ()) < 0)
     ev_syserr ("(libev) epoll_create");
 
   fd_rearm_all (EV_A);

ev_kqueue.c

@@ -129,10 +129,16 @@ kqueue_poll (EV_P_ ev_tstamp timeout)
                   if (fd_valid (fd))
                     kqueue_modify (EV_A_ fd, 0, anfds [fd].events);
                   else
-                    fd_kill (EV_A_ fd);
+                    {
+                      assert (("libev: kqueue found invalid fd", 0));
+                      fd_kill (EV_A_ fd);
+                    }
                 }
               else /* on all other errors, we error out on the fd */
-                fd_kill (EV_A_ fd);
+                {
+                  assert (("libev: kqueue found invalid fd", 0));
+                  fd_kill (EV_A_ fd);
+                }
             }
         }
       else