X-Git-Url: https://git.llucax.com/software/libev.git/blobdiff_plain/caa1fd0cc89d111a00f323bb6eff46f57311aed5..cc491ddade261fb0e1755c6da29a95f1c66e8b32:/ev.c

diff --git a/ev.c b/ev.c
index 246b38f..b2e48f8 100644
--- a/ev.c
+++ b/ev.c
@@ -38,11 +38,11 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 #include <sys/time.h>
 #include <time.h>
 
-#define HAVE_EPOLL 1
-
 #ifndef HAVE_MONOTONIC
 # ifdef CLOCK_MONOTONIC
 #  define HAVE_MONOTONIC 1
@@ -63,6 +63,7 @@
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 60.
+#define PID_HASHSIZE  16 /* size of pid hahs table, must be power of two */
 
 #include "ev.h"
 
@@ -190,6 +191,19 @@ queue_events (W *events, int eventcnt, int type)
     event (events [i], type);
 }
 
+/* called on EBADF to verify fds */
+static void
+fd_recheck ()
+{
+  int fd;
+
+  for (fd = 0; fd < anfdmax; ++fd)
+    if (anfds [fd].wev)
+      if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+        while (anfds [fd].head)
+          evio_stop (anfds [fd].head);
+}
+
 /*****************************************************************************/
 
 static struct ev_timer **timers;
@@ -315,11 +329,38 @@ siginit (void)
 static struct ev_idle **idles;
 static int idlemax, idlecnt;
 
+static struct ev_prepare **prepares;
+static int preparemax, preparecnt;
+
 static struct ev_check **checks;
 static int checkmax, checkcnt;
 
 /*****************************************************************************/
 
+static struct ev_child *childs [PID_HASHSIZE];
+static struct ev_signal childev;
+
+#ifndef WCONTINUED
+# define WCONTINUED 0
+#endif
+
+static void
+childcb (struct ev_signal *sw, int revents)
+{
+  struct ev_child *w;
+  int pid, status;
+
+  while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
+    for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
+      if (w->pid == pid || w->pid == -1)
+        {
+          w->status = status;
+          event ((W)w, EV_CHILD);
+        }
+}
+
+/*****************************************************************************/
+
 #if HAVE_EPOLL
 # include "ev_epoll.c"
 #endif
@@ -356,6 +397,9 @@ int ev_init (int flags)
     {
       evw_init (&sigev, sigcb);
       siginit ();
+
+      evsignal_init (&childev, childcb, SIGCHLD);
+      evsignal_start (&childev);
     }
 
   return ev_method;
@@ -544,20 +588,22 @@ void ev_loop (int flags)
   double block;
   ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
 
-  if (checkcnt)
-    {
-      queue_events ((W *)checks, checkcnt, EV_CHECK);
-      call_pending ();
-    }
-
   do
     {
+      /* queue check watchers (and execute them) */
+      if (preparecnt)
+        {
+          queue_events ((W *)prepares, preparecnt, EV_PREPARE);
+          call_pending ();
+        }
+
       /* update fd-related kernel structures */
       fd_reify ();
 
       /* calculate blocking time */
 
-      /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
+      /* we only need this for !monotonic clockor timers, but as we basically
+         always have timers, we just calculate it always */
       ev_now = ev_time ();
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
@@ -587,15 +633,16 @@ void ev_loop (int flags)
       time_update ();
 
       /* queue pending timers and reschedule them */
-      periodics_reify (); /* absolute timers first */
-      timers_reify (); /* relative timers second */
+      timers_reify (); /* relative timers called last */
+      periodics_reify (); /* absolute timers called first */
 
       /* queue idle watchers unless io or timers are pending */
       if (!pendingcnt)
         queue_events ((W *)idles, idlecnt, EV_IDLE);
 
-      /* queue check and possibly idle watchers */
-      queue_events ((W *)checks, checkcnt, EV_CHECK);
+      /* queue check watchers, to be executed first */
+      if (checkcnt)
+        queue_events ((W *)checks, checkcnt, EV_CHECK);
 
       call_pending ();
     }
@@ -824,6 +871,26 @@ void evidle_stop (struct ev_idle *w)
   ev_stop ((W)w);
 }
 
+void evprepare_start (struct ev_prepare *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, ++preparecnt);
+  array_needsize (prepares, preparemax, preparecnt, );
+  prepares [preparecnt - 1] = w;
+}
+
+void evprepare_stop (struct ev_prepare *w)
+{
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  prepares [w->active - 1] = prepares [--preparecnt];
+  ev_stop ((W)w);
+}
+
 void evcheck_start (struct ev_check *w)
 {
   if (ev_is_active (w))
@@ -844,6 +911,25 @@ void evcheck_stop (struct ev_check *w)
   ev_stop ((W)w);
 }
 
+void evchild_start (struct ev_child *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, 1);
+  wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+}
+
+void evchild_stop (struct ev_child *w)
+{
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+  ev_stop ((W)w);
+}
+
 /*****************************************************************************/
 
 struct ev_once