need to rethinkg design, maybe use 'proper' struct subclassing due to aliasing restri...

[software/libev.git] / ev_poll.c

diff --git a/ev_poll.c b/ev_poll.c
index 4793212dccbc28adcdd9c45edc293727bdcf0856..b858b45491ef48faa908e29b833280d518ffa666 100644 (file)
--- a/ev_poll.c
+++ b/ev_poll.c
@@ -29,82 +29,87 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/epoll.h>
-
-static int epoll_fd = -1;
+#include <poll.h>
 
 static void
-epoll_modify (int fd, int oev, int nev)
+pollidx_init (int *base, int count)
 {
-  int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
-
-  struct epoll_event ev;
-  ev.data.fd = fd;
-  ev.events =
-      (nev & EV_READ ? EPOLLIN : 0)
-      | (nev & EV_WRITE ? EPOLLOUT : 0);
-
-  epoll_ctl (epoll_fd, mode, fd, &ev);
+  while (count--)
+    *base++ = -1;
 }
 
 static void
-epoll_postfork_child (void)
+poll_modify (EV_P_ int fd, int oev, int nev)
 {
-  int fd;
+  int idx;
+  array_needsize (pollidxs, pollidxmax, fd + 1, pollidx_init);
 
-  epoll_fd = epoll_create (256);
-  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
+  idx = pollidxs [fd];
 
-  /* re-register interest in fds */
-  for (fd = 0; fd < anfdmax; ++fd)
-    if (anfds [fd].events)//D
-      epoll_modify (fd, EV_NONE, anfds [fd].events);
-}
+  if (idx < 0) /* need to allocate a new pollfd */
+    {
+      idx = pollcnt++;
+      array_needsize (polls, pollmax, pollcnt, );
+      polls [idx].fd = fd;
+    }
 
-static struct epoll_event *events;
-static int eventmax;
+  if (nev)
+    polls [idx].events =
+        (nev & EV_READ ? POLLIN : 0)
+        | (nev & EV_WRITE ? POLLOUT : 0);
+  else /* remove pollfd */
+    {
+      if (idx < pollcnt--)
+        {
+          pollidxs [fd] = -1;
+          polls [idx] = polls [pollcnt];
+          pollidxs [polls [idx].fd] = idx;
+        }
+    }
+}
 
 static void
-epoll_poll (ev_tstamp timeout)
+poll_poll (EV_P_ ev_tstamp timeout)
 {
-  int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.));
-  int i;
-
-  if (eventcnt < 0)
-    return;
+  int res = poll (polls, pollcnt, ceil (timeout * 1000.));
 
-  for (i = 0; i < eventcnt; ++i)
-    fd_event (
-      events [i].data.fd,
-      (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
-      | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
-    );
-
-  /* if the receive array was full, increase its size */
-  if (expect_false (eventcnt == eventmax))
+  if (res > 0)
+    {
+      int i;
+
+      for (i = 0; i < pollcnt; ++i)
+        fd_event (
+          EV_A_
+          polls [i].fd,
+          (polls [i].revents & (POLLOUT | POLLERR | POLLHUP) ? EV_WRITE : 0)
+          | (polls [i].revents & (POLLIN | POLLERR | POLLHUP) ? EV_READ : 0)
+        );
+    }
+  else if (res < 0)
     {
-      free (events);
-      eventmax = array_roundsize (events, eventmax << 1);
-      events = malloc (sizeof (struct epoll_event) * eventmax);
+      if (errno == EBADF)
+        fd_ebadf (EV_A);
+      else if (errno == ENOMEM)
+        fd_enomem (EV_A);
     }
 }
 
-static void
-epoll_init (int flags)
+static int
+poll_init (EV_P_ int flags)
 {
-  epoll_fd = epoll_create (256);
-
-  if (epoll_fd < 0)
-    return;
+  method_fudge  = 1e-3; /* needed to compensate for select returning early, very conservative */
+  method_modify = poll_modify;
+  method_poll   = poll_poll;
 
-  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
+  pollidxs = 0; pollidxmax = 0;
+  polls    = 0; pollmax    = 0; pollcnt = 0;
 
-  ev_method     = EVMETHOD_EPOLL;
-  method_fudge  = 1e-3; /* needed to compensate for epoll returning early */
-  method_modify = epoll_modify;
-  method_poll   = epoll_poll;
-
-  eventmax = 64; /* intiial number of events receivable per poll */
-  events = malloc (sizeof (struct epoll_event) * eventmax);
+  return EVMETHOD_POLL;
 }
 
+static void
+poll_destroy (EV_P)
+{
+  free (pollidxs);
+  free (polls);
+}