rework signal and child handling

diff --git a/ev.c b/ev.c
index 6c2f3977d815a785bbdc78b5acd24b8f410b9f10..7bed969f17e5c8331f8f8309e87ee227562fd998 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -478,19 +478,35 @@ static struct ev_signal childev;
 #endif
 
 static void
 #endif
 
 static void

-childcb (struct ev_signal *sw, int revents)
+child_reap (struct ev_signal *sw, int chain, int pid, int status)

 {
   struct ev_child *w;
 {
   struct ev_child *w;

+
+  for (w = childs [chain & (PID_HASHSIZE - 1)]; w; w = w->next)
+    if (w->pid == pid || !w->pid)
+      {
+        w->priority = sw->priority; /* need to do it *now* */
+        w->rpid     = pid;
+        w->rstatus  = status;
+        printf ("rpid %p %d %d\n", w, pid, w->pid);//D
+        event ((W)w, EV_CHILD);
+      }
+}
+
+static void
+childcb (struct ev_signal *sw, int revents)
+{

   int pid, status;
 
   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)
-        {
-          w->rpid    = pid;
-          w->rstatus = status;
-          event ((W)w, EV_CHILD);
-        }
+            printf ("chld %x\n", revents);//D
+  if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
+    {
+      /* make sure we are called again until all childs have been reaped */
+      event ((W)sw, EV_SIGNAL);
+
+      child_reap (sw, pid, pid, status);
+      child_reap (sw,   0, pid, status); /* this might trigger a watcher twice, but event catches that */
+    }

 }
 
 #endif
 }
 
 #endif


@@ -573,10 +589,12 @@ int ev_init (int methods)
       if (ev_method)
         {
           ev_watcher_init (&sigev, sigcb);
       if (ev_method)
         {
           ev_watcher_init (&sigev, sigcb);

+          ev_set_priority (&sigev, EV_MAXPRI);

           siginit ();
 
 #ifndef WIN32
           ev_signal_init (&childev, childcb, SIGCHLD);
           siginit ();
 
 #ifndef WIN32
           ev_signal_init (&childev, childcb, SIGCHLD);

+          ev_set_priority (&childev, EV_MAXPRI);

           ev_signal_start (&childev);
 #endif
         }
           ev_signal_start (&childev);
 #endif
         }


@@ -1010,6 +1028,10 @@ ev_periodic_stop (struct ev_periodic *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

+#ifndef SA_RESTART
+# define SA_RESTART 0
+#endif
+

 void
 ev_signal_start (struct ev_signal *w)
 {
 void
 ev_signal_start (struct ev_signal *w)
 {


@@ -1027,7 +1049,7 @@ ev_signal_start (struct ev_signal *w)
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);

-      sa.sa_flags = 0;
+      sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */

       sigaction (w->signum, &sa, 0);
     }
 }
       sigaction (w->signum, &sa, 0);
     }
 }

diff --git a/ev.h b/ev.h
index 8d2922d9c8d112643afb99cbb9bcce2437138db7..1e88f025120e793166c55d4d45d84e27705555a2 100644 (file)
--- a/ev.h
+++ b/ev.h
@@ -168,6 +168,7 @@ struct ev_check
 
 /* invoked when sigchld is received and waitpid indicates the givne pid */
 /* revent EV_CHILD */
 
 /* invoked when sigchld is received and waitpid indicates the givne pid */
 /* revent EV_CHILD */

+/* does not support priorities */

 struct ev_child
 {
   EV_WATCHER_LIST (ev_child);
 struct ev_child
 {
   EV_WATCHER_LIST (ev_child);

diff --git a/ev_epoll.c b/ev_epoll.c
index d38672f14cb61f50be4537cd7426daae9d613811..a7918aff9a74fe7b091f0b18ccb2d4f14032cb51 100644 (file)
--- a/ev_epoll.c
+++ b/ev_epoll.c
@@ -75,7 +75,7 @@ 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,
+      events [i].data.u64,

       (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
       | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
     );
       (events [i].events & (EPOLLOUT | EPOLLERR | EPOLLHUP) ? EV_WRITE : 0)
       | (events [i].events & (EPOLLIN | EPOLLERR | EPOLLHUP) ? EV_READ : 0)
     );