prepare for multiple bases

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index 92587c21a73ccdecb84e696f9dfba2b4b7e8228e..30d1b257f96616f6e72c7d3bfa111a2c7d8bcb62 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -1,4 +1,6 @@
 /*
 /*

+ * libev epoll fd activity backend
+ *

  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *


@@ -29,15 +31,13 @@
 
 #include <sys/epoll.h>
 
 
 #include <sys/epoll.h>
 

-static int epoll_fd = -1;
-

 static void
 static void

-epoll_modify (int fd, int oev, int nev)
+epoll_modify (EV_P_ 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);


@@ -46,7 +46,7 @@ epoll_modify (int fd, int oev, int nev)
 }
 
 static void
 }
 
 static void

-epoll_postfork_child (void)
+epoll_postfork_child (EV_P)

 {
   int fd;
 
 {
   int fd;
 


@@ -55,15 +55,12 @@ epoll_postfork_child (void)
 
   /* 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 (EV_A_ fd, EV_NONE, anfds [fd].events);

 }
 
 }
 

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

 static void
 static void

-epoll_poll (ev_tstamp timeout)
+epoll_poll (EV_P_ 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;


@@ -73,36 +70,38 @@ 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,
+      EV_A_
+      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);
     }
 }
 

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

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

-    return;
+    return 0;

 
   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 
 
   fcntl (epoll_fd, F_SETFD, FD_CLOEXEC);
 

-  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 EVMETHOD_EPOLL;

 }
 
 }