do not support multiple event bases. period.

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index b3b546f4c352d4bedd9d5f2e934ff91a82bf56a8..a7918aff9a74fe7b091f0b18ccb2d4f14032cb51 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -1,3 +1,34 @@
+/*
+ * libev epoll fd activity backend
+ *
+ * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+

 #include <sys/epoll.h>
 
 static int epoll_fd = -1;
 #include <sys/epoll.h>
 
 static int epoll_fd = -1;


@@ -8,32 +39,33 @@ epoll_modify (int fd, int oev, int nev)
   int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
 
   struct epoll_event ev;
   int mode = nev ? oev ? EPOLL_CTL_MOD : EPOLL_CTL_ADD : EPOLL_CTL_DEL;
 
   struct epoll_event ev;

-  ev.data.fd = fd;
+  ev.data.u64 = fd; /* use u64 to fully initialise the struct, for nicer strace etc. */

   ev.events =
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 
   ev.events =
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 

-  fprintf (stderr, "reify %d,%d,%d m%d (r=%d)\n", fd, oev, nev, mode,//D
-  epoll_ctl (epoll_fd, mode, fd, &ev)
-  );//D
+  epoll_ctl (epoll_fd, mode, fd, &ev);

 }
 
 }
 

-void epoll_postfork_child (void)
+static void
+epoll_postfork_child (void)

 {
   int fd;
 
   epoll_fd = epoll_create (256);
 {
   int fd;
 
   epoll_fd = epoll_create (256);

+  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);

 
   /* re-register interest in fds */
   for (fd = 0; fd < anfdmax; ++fd)
 
   /* re-register interest in fds */
   for (fd = 0; fd < anfdmax; ++fd)

-    if (anfds [fd].wev)
-      epoll_modify (fd, EV_NONE, anfds [fd].wev);
+    if (anfds [fd].events)//D
+      epoll_modify (fd, EV_NONE, anfds [fd].events);

 }
 
 static struct epoll_event *events;
 static int eventmax;
 
 }
 
 static struct epoll_event *events;
 static int eventmax;
 

-static void epoll_poll (ev_tstamp timeout)
+static void
+epoll_poll (ev_tstamp timeout)

 {
   int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.));
   int i;
 {
   int eventcnt = epoll_wait (epoll_fd, events, eventmax, ceil (timeout * 1000.));
   int i;


@@ -43,34 +75,36 @@ static void epoll_poll (ev_tstamp timeout)
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (
 
   for (i = 0; i < eventcnt; ++i)
     fd_event (

-      events [i].data.fd,
+      events [i].data.u64,

       (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 */
       (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 (eventcnt == eventmax)
+  if (expect_false (eventcnt == eventmax))

     {
       free (events);
     {
       free (events);

-      eventmax += eventmax >> 1;
+      eventmax = array_roundsize (events, eventmax << 1);

       events = malloc (sizeof (struct epoll_event) * eventmax);
     }
 }
 
       events = malloc (sizeof (struct epoll_event) * eventmax);
     }
 }
 

-int epoll_init (int flags)
+static void
+epoll_init (int flags)

 {
   epoll_fd = epoll_create (256);
 
   if (epoll_fd < 0)
 {
   epoll_fd = epoll_create (256);
 
   if (epoll_fd < 0)

-    return 0;
+    return;
+
+  fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);

 
 

-  ev_method = EVMETHOD_EPOLL;
+  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);
   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 1;

 }
 }

+