pointless oo removed, rename HAVE_xxx to EV_USE_xxx

[software/libev.git] / ev_epoll.c

diff --git a/ev_epoll.c b/ev_epoll.c
index 11ee92607b30267339dac5fa48a32f2c294adfc3..d03f8a55dbcc9559ac380410dfb1ff714fe10fff 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -1,3 +1,32 @@
+/*
+ * 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;


@@ -13,12 +42,11 @@ epoll_modify (int fd, int oev, int nev)
       (nev & EV_READ ? EPOLLIN : 0)
       | (nev & EV_WRITE ? EPOLLOUT : 0);
 
       (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;
 
 {
   int fd;
 


@@ -27,14 +55,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 && !(anfds [fd].events & EV_REIFY))//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;


@@ -58,7 +87,8 @@ static void epoll_poll (ev_tstamp timeout)
     }
 }
 
     }
 }
 

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

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


@@ -75,3 +105,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);
 }

+