*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index e87da22585746f6470433433d27988503ee77760..2f46f79ba9567441c8112c087997daee11361155 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -204,11 +204,8 @@ extern "C" {
 # define EV_USE_REALTIME 0
 #endif
 
-#if EV_SELECT_IS_WINSOCKET
-# include <winsock.h>
-#endif
-
 #if !EV_STAT_ENABLE
+# undef EV_USE_INOTIFY
 # define EV_USE_INOTIFY 0
 #endif
 
@@ -216,6 +213,10 @@ extern "C" {
 # include <sys/inotify.h>
 #endif
 
+#if EV_SELECT_IS_WINSOCKET
+# include <winsock.h>
+#endif
+
 /**/
 
 /*
@@ -232,7 +233,7 @@ extern "C" {
 #define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
 /*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
 
-#if __GNUC__ >= 3
+#if __GNUC__ >= 4
 # define expect(expr,value)         __builtin_expect ((expr),(value))
 # define noinline                   __attribute__ ((noinline))
 #else
@@ -535,10 +536,10 @@ fd_reify (EV_P)
       ANFD *anfd = anfds + fd;
       ev_io *w;
 
-      int events = 0;
+      unsigned char events = 0;
 
       for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
-        events |= w->events;
+        events |= (unsigned char)w->events;
 
 #if EV_SELECT_IS_WINSOCKET
       if (events)
@@ -549,26 +550,33 @@ fd_reify (EV_P)
         }
 #endif
 
-      anfd->reify = 0;
+      {
+        unsigned char o_events = anfd->events;
+        unsigned char o_reify  = anfd->reify;
+
+        anfd->reify  = 0;
+        anfd->events = events;
 
-      backend_modify (EV_A_ fd, anfd->events, events);
-      anfd->events = events;
+        if (o_events != events || o_reify & EV_IOFDSET)
+          backend_modify (EV_A_ fd, o_events, events);
+      }
     }
 
   fdchangecnt = 0;
 }
 
 void inline_size
-fd_change (EV_P_ int fd)
+fd_change (EV_P_ int fd, int flags)
 {
-  if (expect_false (anfds [fd].reify))
-    return;
-
-  anfds [fd].reify = 1;
+  unsigned char reify = anfds [fd].reify;
+  anfds [fd].reify |= flags;
 
-  ++fdchangecnt;
-  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
-  fdchanges [fdchangecnt - 1] = fd;
+  if (expect_true (!reify))
+    {
+      ++fdchangecnt;
+      array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
+      fdchanges [fdchangecnt - 1] = fd;
+    }
 }
 
 void inline_speed
@@ -629,7 +637,7 @@ fd_rearm_all (EV_P)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
-        fd_change (EV_A_ fd);
+        fd_change (EV_A_ fd, EV_IOFDSET | 1);
       }
 }
 
@@ -794,7 +802,7 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
-static ev_child *childs [EV_PID_HASHSIZE];
+static WL childs [EV_PID_HASHSIZE];
 
 #ifndef _WIN32
 
@@ -1032,11 +1040,16 @@ loop_destroy (EV_P)
 #endif
     }
 
+  ev_free (anfds); anfdmax = 0;
+
   /* have to use the microsoft-never-gets-it-right macro */
   array_free (fdchange, EMPTY);
   array_free (timer, EMPTY);
 #if EV_PERIODIC_ENABLE
   array_free (periodic, EMPTY);
+#endif
+#if EV_FORK_ENABLE
+  array_free (fork, EMPTY);
 #endif
   array_free (prepare, EMPTY);
   array_free (check, EMPTY);
@@ -1599,9 +1612,10 @@ ev_io_start (EV_P_ ev_io *w)
 
   ev_start (EV_A_ (W)w, 1);
   array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
-  wlist_add ((WL *)&anfds[fd].head, (WL)w);
+  wlist_add (&anfds[fd].head, (WL)w);
 
-  fd_change (EV_A_ fd);
+  fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
+  w->events &= ~EV_IOFDSET;
 }
 
 void noinline
@@ -1613,10 +1627,10 @@ ev_io_stop (EV_P_ ev_io *w)
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
 
-  wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
+  wlist_del (&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
 
-  fd_change (EV_A_ w->fd);
+  fd_change (EV_A_ w->fd, 1);
 }
 
 void noinline
@@ -1768,7 +1782,7 @@ ev_signal_start (EV_P_ ev_signal *w)
   }
 
   ev_start (EV_A_ (W)w, 1);
-  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
+  wlist_add (&signals [w->signum - 1].head, (WL)w);
 
   if (!((WL)w)->next)
     {
@@ -1791,7 +1805,7 @@ ev_signal_stop (EV_P_ ev_signal *w)
   if (expect_false (!ev_is_active (w)))
     return;
 
-  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
+  wlist_del (&signals [w->signum - 1].head, (WL)w);
   ev_stop (EV_A_ (W)w);
 
   if (!signals [w->signum - 1].head)
@@ -1808,7 +1822,7 @@ ev_child_start (EV_P_ ev_child *w)
     return;
 
   ev_start (EV_A_ (W)w, 1);
-  wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
+  wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
 }
 
 void
@@ -1818,7 +1832,7 @@ ev_child_stop (EV_P_ ev_child *w)
   if (expect_false (!ev_is_active (w)))
     return;
 
-  wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
+  wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
   ev_stop (EV_A_ (W)w);
 }
 
@@ -2170,11 +2184,11 @@ ev_check_stop (EV_P_ ev_check *w)
 void noinline
 ev_embed_sweep (EV_P_ ev_embed *w)
 {
-  ev_loop (w->loop, EVLOOP_NONBLOCK);
+  ev_loop (w->other, EVLOOP_NONBLOCK);
 }
 
 static void
-embed_cb (EV_P_ ev_io *io, int revents)
+embed_io_cb (EV_P_ ev_io *io, int revents)
 {
   ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
 
@@ -2184,6 +2198,14 @@ embed_cb (EV_P_ ev_io *io, int revents)
     ev_embed_sweep (loop, w);
 }
 
+static void
+embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
+{
+  ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
+
+  fd_reify (w->other);
+}
+
 void
 ev_embed_start (EV_P_ ev_embed *w)
 {
@@ -2191,14 +2213,18 @@ ev_embed_start (EV_P_ ev_embed *w)
     return;
 
   {
-    struct ev_loop *loop = w->loop;
+    struct ev_loop *loop = w->other;
     assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
-    ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
+    ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
   }
 
   ev_set_priority (&w->io, ev_priority (w));
   ev_io_start (EV_A_ &w->io);
 
+  ev_prepare_init (&w->prepare, embed_prepare_cb);
+  ev_set_priority (&w->prepare, EV_MINPRI);
+  ev_prepare_start (EV_A_ &w->prepare);
+
   ev_start (EV_A_ (W)w, 1);
 }
 
@@ -2210,6 +2236,7 @@ ev_embed_stop (EV_P_ ev_embed *w)
     return;
 
   ev_io_stop (EV_A_ &w->io);
+  ev_prepare_stop (EV_A_ &w->prepare);
 
   ev_stop (EV_A_ (W)w);
 }
@@ -2308,6 +2335,10 @@ ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, vo
     }
 }
 
+#if EV_MULTIPLICITY
+  #include "ev_wrap.h"
+#endif
+
 #ifdef __cplusplus
 }
 #endif