*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index c77ad2ac642278ef57cef35011ed9d24a5bcbc1d..6c2f3977d815a785bbdc78b5acd24b8f410b9f10 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -44,7 +44,9 @@
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <assert.h>
 #include <errno.h>
 #include <sys/types.h>

-#include <sys/wait.h>
+#ifndef WIN32
+# include <sys/wait.h>
+#endif

 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 


@@ -66,6 +68,10 @@
 # define EV_USE_EPOLL 0
 #endif
 
 # define EV_USE_EPOLL 0
 #endif
 

+#ifndef EV_USE_KQUEUE
+# define EV_USE_KQUEUE 0
+#endif
+

 #ifndef EV_USE_REALTIME
 # define EV_USE_REALTIME 1
 #endif
 #ifndef EV_USE_REALTIME
 # define EV_USE_REALTIME 1
 #endif


@@ -102,6 +108,9 @@
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 
 #define expect_false(expr) expect ((expr) != 0, 0)
 #define expect_true(expr)  expect ((expr) != 0, 1)
 

+#define NUMPRI    (EV_MAXPRI - EV_MINPRI + 1)
+#define ABSPRI(w) ((w)->priority - EV_MINPRI)
+

 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 typedef struct ev_watcher_time *WT;
 typedef struct ev_watcher *W;
 typedef struct ev_watcher_list *WL;
 typedef struct ev_watcher_time *WT;


@@ -195,22 +204,22 @@ typedef struct
   int events;
 } ANPENDING;
 
   int events;
 } ANPENDING;
 

-static ANPENDING *pendings;
-static int pendingmax, pendingcnt;
+static ANPENDING *pendings [NUMPRI];
+static int pendingmax [NUMPRI], pendingcnt [NUMPRI];

 
 static void
 event (W w, int events)
 {
   if (w->pending)
     {
 
 static void
 event (W w, int events)
 {
   if (w->pending)
     {

-      pendings [w->pending - 1].events |= events;
+      pendings [ABSPRI (w)][w->pending - 1].events |= events;

       return;
     }
 
       return;
     }
 

-  w->pending = ++pendingcnt;
-  array_needsize (pendings, pendingmax, pendingcnt, );
-  pendings [pendingcnt - 1].w      = w;
-  pendings [pendingcnt - 1].events = events;
+  w->pending = ++pendingcnt [ABSPRI (w)];
+  array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
+  pendings [ABSPRI (w)][w->pending - 1].w      = w;
+  pendings [ABSPRI (w)][w->pending - 1].events = events;

 }
 
 static void
 }
 
 static void


@@ -433,12 +442,14 @@ sigcb (struct ev_io *iow, int revents)
 static void
 siginit (void)
 {
 static void
 siginit (void)
 {

+#ifndef WIN32

   fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
   fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
 
   /* rather than sort out wether we really need nb, set it */
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
   fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
 
   /* rather than sort out wether we really need nb, set it */
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);

+#endif

 
   ev_io_set (&sigev, sigpipe [0], EV_READ);
   ev_io_start (&sigev);
 
   ev_io_set (&sigev, sigpipe [0], EV_READ);
   ev_io_start (&sigev);


@@ -460,6 +471,8 @@ static int checkmax, checkcnt;
 static struct ev_child *childs [PID_HASHSIZE];
 static struct ev_signal childev;
 
 static struct ev_child *childs [PID_HASHSIZE];
 static struct ev_signal childev;
 

+#ifndef WIN32
+

 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif
 #ifndef WCONTINUED
 # define WCONTINUED 0
 #endif


@@ -474,13 +487,19 @@ childcb (struct ev_signal *sw, int revents)
     for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
       if (w->pid == pid || !w->pid)
         {
     for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
       if (w->pid == pid || !w->pid)
         {

-          w->status = status;
+          w->rpid    = pid;
+          w->rstatus = status;

           event ((W)w, EV_CHILD);
         }
 }
 
           event ((W)w, EV_CHILD);
         }
 }
 

+#endif
+

 /*****************************************************************************/
 
 /*****************************************************************************/
 

+#if EV_USE_KQUEUE
+# include "ev_kqueue.c"
+#endif

 #if EV_USE_EPOLL
 # include "ev_epoll.c"
 #endif
 #if EV_USE_EPOLL
 # include "ev_epoll.c"
 #endif


@@ -538,6 +557,9 @@ int ev_init (int methods)
             methods = EVMETHOD_ANY;
 
       ev_method = 0;
             methods = EVMETHOD_ANY;
 
       ev_method = 0;

+#if EV_USE_KQUEUE
+      if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
+#endif

 #if EV_USE_EPOLL
       if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init  (methods);
 #endif
 #if EV_USE_EPOLL
       if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init  (methods);
 #endif


@@ -553,8 +575,10 @@ int ev_init (int methods)
           ev_watcher_init (&sigev, sigcb);
           siginit ();
 
           ev_watcher_init (&sigev, sigcb);
           siginit ();
 

+#ifndef WIN32

           ev_signal_init (&childev, childcb, SIGCHLD);
           ev_signal_start (&childev);
           ev_signal_init (&childev, childcb, SIGCHLD);
           ev_signal_start (&childev);

+#endif

         }
     }
 
         }
     }
 


@@ -595,16 +619,19 @@ ev_fork_child (void)
 static void
 call_pending (void)
 {
 static void
 call_pending (void)
 {

-  while (pendingcnt)
-    {
-      ANPENDING *p = pendings + --pendingcnt;
+  int pri;

 
 

-      if (p->w)
-        {
-          p->w->pending = 0;
-          p->w->cb (p->w, p->events);
-        }
-    }
+  for (pri = NUMPRI; pri--; )
+    while (pendingcnt [pri])
+      {
+        ANPENDING *p = pendings [pri] + --pendingcnt [pri];
+
+        if (p->w)
+          {
+            p->w->pending = 0;
+            p->w->cb (p->w, p->events);
+          }
+      }

 }
 
 static void
 }
 
 static void


@@ -846,7 +873,7 @@ ev_clear_pending (W w)
 {
   if (w->pending)
     {
 {
   if (w->pending)
     {

-      pendings [w->pending - 1].w = 0;
+      pendings [ABSPRI (w)][w->pending - 1].w = 0;

       w->pending = 0;
     }
 }
       w->pending = 0;
     }
 }


@@ -854,6 +881,9 @@ ev_clear_pending (W w)
 static void
 ev_start (W w, int active)
 {
 static void
 ev_start (W w, int active)
 {

+  if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
+  if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
+

   w->active = active;
 }
 
   w->active = active;
 }