[ViewVC] Diff of: cvs/libev/ev

Comparing libev/ev_linuxaio.c (file contents):
Revision 1.13 by root, Sun Jun 23 23:38:38 2019 UTC vs.
Revision 1.18 by root, Mon Jun 24 04:54:08 2019 UTC

       linuxaio_iocbps [fd]->io.aio_buf = 0;
       anfds [fd].events = 0;
       fd_change (EV_A_ fd, 0);
       /* feed events, we do not expect or handle POLLNVAL */
-      if (ecb_expect_false (res & POLLNVAL))
+      if (expect_false (res & POLLNVAL))
         fd_kill (EV_A_ fd);
       else
         fd_event (
           EV_A_
           fd,
   if (head == tail)
     return 0;
   /* bail out if the ring buffer doesn't match the expected layout */
-  if (ecb_expect_false (ring->magic != AIO_RING_MAGIC)
+  if (expect_false (ring->magic != AIO_RING_MAGIC)
-                        || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
+                    || ring->incompat_features != AIO_RING_INCOMPAT_FEATURES
-                        || ring->header_length != sizeof (struct aio_ring)) /* TODO: or use it to find io_event[0]? */
+                    || ring->header_length != sizeof (struct aio_ring)) /* TODO: or use it to find io_event[0]? */
     return 0;
   /* make sure the events up to tail are visible */
   ECB_MEMORY_FENCE_ACQUIRE;
     {
       linuxaio_parse_events (EV_A_ ring->io_events + head, ring->nr - head);
       linuxaio_parse_events (EV_A_ ring->io_events, tail);
     }
+  /* TODO: we only need a compiler barrier here, not a read fence */
+  ECB_MEMORY_FENCE_RELEASE;
-  /* as an extension to C, we hope that the volatile will makethis atomic and once-only */
+  /* as an extension to C, we hope that the volatile will make this atomic and once-only */
   *(volatile unsigned *)&ring->head = tail;
   /* make sure kernel can see our new head value - probably not required */
   ECB_MEMORY_FENCE_RELEASE;
   return 1;
 inline_size
 void
 linuxaio_get_events (EV_P_ ev_tstamp timeout)
 {
   struct timespec ts;
-  struct io_event ioev;
+  struct io_event ioev[1];
   int res;
   if (linuxaio_get_events_from_ring (EV_A))
     return;
   /* if the ring buffer changes layout, but so be it */
   ts.tv_sec  = (long)timeout;
   ts.tv_nsec = (long)((timeout - ts.tv_sec) * 1e9);
-  res = ev_io_getevents (linuxaio_ctx, 1, 1, &ioev, &ts);
+  res = ev_io_getevents (linuxaio_ctx, 1, sizeof (ioev) / sizeof (ioev [0]), ioev, &ts);
   if (res < 0)
     if (errno == EINTR)
       /* ignored */;
     else
       ev_syserr ("(libev) linuxaio io_getevents");
   else if (res)
     {
       /* at least one event received, handle it and any remaining ones in the ring buffer */
-      linuxaio_parse_events (EV_A_ &ioev, 1);
+      linuxaio_parse_events (EV_A_ ioev, res);
       linuxaio_get_events_from_ring (EV_A);
     }
 }
 #if EPOLL_FALLBACK
   /* which allows us to pinpoint the errornous iocb */
   for (submitted = 0; submitted < linuxaio_submitcnt; )
     {
       int res = ev_io_submit (linuxaio_ctx, linuxaio_submitcnt - submitted, linuxaio_submits + submitted);
-      if (ecb_expect_false (res < 0))
+      if (expect_false (res < 0))
         if (errno == EAGAIN)
           {
             /* This happens when the ring buffer is full, at least. I assume this means
              * that the event was queued synchronously during io_submit, and thus
              * the buffer overflowed.
             break;
           }
 #if EPOLL_FALLBACK
         else if (errno == EINVAL)
           {
-            /* This hapüpens for unsupported fds, officially, but in my testing,
+            /* This happens for unsupported fds, officially, but in my testing,
              * also randomly happens for supported fds. We fall back to good old
              * poll() here, under the assumption that this is a very rare case.
+             * See https://lore.kernel.org/patchwork/patch/1047453/ for evidence
+             * that the problem is known, but ignored.
              */
             struct iocb *iocb = linuxaio_submits [submitted];
             res = 1; /* skip this iocb */
             linuxaio_rearm_epoll (EV_A_ iocb, EPOLL_CTL_ADD);
   for (;;)
     {
       int idx;
       int res = epoll_wait (backend_fd, events, sizeof (events) / sizeof (events [0]), 0);
-      if (ecb_expect_false (res < 0))
+      if (expect_false (res < 0))
         ev_syserr ("(libev) linuxaio epoll_wait");
       else if (!res)
         break;
       for (idx = res; idx--; )
 int
 linuxaio_init (EV_P_ int flags)
 {
   /* would be great to have a nice test for IOCB_CMD_POLL instead */
   /* also: test some semi-common fd types, such as files and ttys in recommended_backends */
-  if (ev_linux_version () < 0x041200) /* 4.18 introduced IOCB_CMD_POLL */
+#if EPOLL_FALLBACK
+  /* 4.19 made epoll work */
+  if (ev_linux_version () < 0x041300)
     return 0;
+#else
+  /* 4.18 introduced IOCB_CMD_POLL */
+  if (ev_linux_version () < 0x041200)
+    return 0;
+#endif
   linuxaio_ctx = 0;
   if (ev_io_setup (EV_LINUXAIO_DEPTH, &linuxaio_ctx) < 0)
     return 0;
       return 0;
     }
   ev_io_init  (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
   ev_io_start (EV_A_ &linuxaio_epoll_w);
+  ev_unref (EV_A); /* watcher should not keep loop alive */
 #endif
   backend_modify  = linuxaio_modify;
   backend_poll    = linuxaio_poll;
    ev_syserr ("(libev) linuxaio epoll_create");
   ev_io_stop  (EV_A_ &linuxaio_epoll_w);
   ev_io_init  (EV_A_ &linuxaio_epoll_w, linuxaio_epoll_cb, backend_fd, EV_READ);
   ev_io_start (EV_A_ &linuxaio_epoll_w);
-  ev_unref (EV_A); /* watcher should not keep loop alive */
 #endif
   fd_rearm_all (EV_A);
 }

Diff Legend

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

Comparing libev/ev_linuxaio.c (file contents): Revision 1.13 by root, Sun Jun 23 23:38:38 2019 UTC vs. Revision 1.18 by root, Mon Jun 24 04:54:08 2019 UTC

Diff Legend

Comparing libev/ev_linuxaio.c (file contents):
Revision 1.13 by root, Sun Jun 23 23:38:38 2019 UTC vs.
Revision 1.18 by root, Mon Jun 24 04:54:08 2019 UTC