*** empty log message ***

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index c6d3af53274e148546af1539f12725de02b14ef4..4793212dccbc28adcdd9c45edc293727bdcf0856 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.
  *


@@ -45,7 +47,8 @@ epoll_modify (int fd, int oev, int nev)
   epoll_ctl (epoll_fd, mode, fd, &ev);
 }
 
   epoll_ctl (epoll_fd, mode, fd, &ev);
 }
 

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

 {
   int fd;
 
 {
   int fd;
 


@@ -54,14 +57,15 @@ void 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 (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;


@@ -77,15 +81,16 @@ static void epoll_poll (ev_tstamp timeout)
     );
 
   /* if the receive array was full, increase its size */
     );
 
   /* 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);
     }
 }
 

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

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


@@ -102,3 +107,4 @@ void epoll_init (int flags)
   eventmax = 64; /* intiial number of events receivable per poll */
   events = malloc (sizeof (struct epoll_event) * eventmax);
 }
   eventmax = 64; /* intiial number of events receivable per poll */
   events = malloc (sizeof (struct epoll_event) * eventmax);
 }

+