introduce MUCH needed internal typedefs, better autoconfiguration

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 889dfe63c76b332a70969a581def965a09df23ec..01b9df26a53cd527d6586ccc2284e648dca39e36 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,5 +1,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include <math.h>
 #include <stdlib.h>

+#include <unistd.h>
+#include <fcntl.h>
+#include <signal.h>

 
 #include <stdio.h>
 
 
 #include <stdio.h>
 


@@ -8,13 +11,23 @@
 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 

-#ifdef CLOCK_MONOTONIC
-# define HAVE_MONOTONIC 1
+#ifndef HAVE_MONOTONIC
+# ifdef CLOCK_MONOTONIC
+#  define HAVE_MONOTONIC 1
+# endif

 #endif
 
 #endif
 

-#define HAVE_EPOLL 1
-#define HAVE_REALTIME 1
-#define HAVE_SELECT 1
+#ifndef HAVE_SELECT
+# define HAVE_SELECT 1
+#endif
+
+#ifndef HAVE_EPOLL
+# define HAVE_EPOLL 0
+#endif
+
+#ifndef HAVE_REALTIME
+# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
+#endif

 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 60.
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 60.


@@ -29,6 +42,9 @@ struct ev_watcher_list {
   EV_WATCHER_LIST (ev_watcher_list);
 };
 
   EV_WATCHER_LIST (ev_watcher_list);
 };
 

+typedef struct ev_watcher *W;
+typedef struct ev_watcher_list *WL;
+

 static ev_tstamp now, diff; /* monotonic clock */
 ev_tstamp ev_now;
 int ev_method;
 static ev_tstamp now, diff; /* monotonic clock */
 ev_tstamp ev_now;
 int ev_method;


@@ -39,6 +55,8 @@ static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
 static void (*method_modify)(int fd, int oev, int nev);
 static void (*method_poll)(ev_tstamp timeout);
 
 static void (*method_modify)(int fd, int oev, int nev);
 static void (*method_poll)(ev_tstamp timeout);
 

+/*****************************************************************************/
+

 ev_tstamp
 ev_time (void)
 {
 ev_tstamp
 ev_time (void)
 {


@@ -78,6 +96,8 @@ get_clock (void)
       cur = newcnt;                                    \
     }
 
       cur = newcnt;                                    \
     }
 

+/*****************************************************************************/
+

 typedef struct
 {
   struct ev_io *head;
 typedef struct
 {
   struct ev_io *head;


@@ -103,7 +123,7 @@ anfds_init (ANFD *base, int count)
 
 typedef struct
 {
 
 typedef struct
 {

-  struct ev_watcher *w;
+  W w;

   int events;
 } ANPENDING;
 
   int events;
 } ANPENDING;
 


@@ -111,7 +131,7 @@ static ANPENDING *pendings;
 static int pendingmax, pendingcnt;
 
 static void
 static int pendingmax, pendingcnt;
 
 static void

-event (struct ev_watcher *w, int events)
+event (W w, int events)

 {
   w->pending = ++pendingcnt;
   array_needsize (pendings, pendingmax, pendingcnt, );
 {
   w->pending = ++pendingcnt;
   array_needsize (pendings, pendingmax, pendingcnt, );


@@ -130,10 +150,21 @@ fd_event (int fd, int events)
       int ev = w->events & events;
 
       if (ev)
       int ev = w->events & events;
 
       if (ev)

-        event ((struct ev_watcher *)w, ev);
+        event ((W)w, ev);

     }
 }
 
     }
 }
 

+static void
+queue_events (W *events, int eventcnt, int type)
+{
+  int i;
+
+  for (i = 0; i < eventcnt; ++i)
+    event (events [i], type);
+}
+
+/*****************************************************************************/
+

 static struct ev_timer **atimers;
 static int atimermax, atimercnt;
 
 static struct ev_timer **atimers;
 static int atimermax, atimercnt;
 


@@ -181,16 +212,87 @@ downheap (struct ev_timer **timers, int N, int k)
   timers [k]->active = k + 1;
 }
 
   timers [k]->active = k + 1;
 }
 

-static struct ev_signal **signals;
+/*****************************************************************************/
+
+typedef struct
+{
+  struct ev_signal *head;
+  sig_atomic_t gotsig;
+} ANSIG;
+
+static ANSIG *signals;

 static int signalmax;
 
 static int signalmax;
 

+static int sigpipe [2];
+static sig_atomic_t gotsig;
+static struct ev_io sigev;
+

 static void
 static void

-signals_init (struct ev_signal **base, int count)
+signals_init (ANSIG *base, int count)

 {
   while (count--)
 {
   while (count--)

-    *base++ = 0;
+    {
+      base->head   = 0;
+      base->gotsig = 0;
+      ++base;
+    }

 }
 
 }
 

+static void
+sighandler (int signum)
+{
+  signals [signum - 1].gotsig = 1;
+
+  if (!gotsig)
+    {
+      gotsig = 1;
+      write (sigpipe [1], &gotsig, 1);
+    }
+}
+
+static void
+sigcb (struct ev_io *iow, int revents)
+{
+  struct ev_signal *w;
+  int sig;
+
+  gotsig = 0;
+  read (sigpipe [0], &revents, 1);
+
+  for (sig = signalmax; sig--; )
+    if (signals [sig].gotsig)
+      {
+        signals [sig].gotsig = 0;
+
+        for (w = signals [sig].head; w; w = w->next)
+          event ((W)w, EV_SIGNAL);
+      }
+}
+
+static void
+siginit (void)
+{
+  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);
+
+  evio_set (&sigev, sigpipe [0], EV_READ);
+  evio_start (&sigev);
+}
+
+/*****************************************************************************/
+
+static struct ev_idle **idles;
+static int idlemax, idlecnt;
+
+static struct ev_check **checks;
+static int checkmax, checkcnt;
+
+/*****************************************************************************/
+

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


@@ -212,19 +314,28 @@ int ev_init (int flags)
   now    = get_clock ();
   diff   = ev_now - now;
 
   now    = get_clock ();
   diff   = ev_now - now;
 

+  if (pipe (sigpipe))
+    return 0;
+
+  ev_method = EVMETHOD_NONE;

 #if HAVE_EPOLL
 #if HAVE_EPOLL

-  if (epoll_init (flags))
-    return ev_method;
+  if (ev_method == EVMETHOD_NONE) epoll_init (flags);

 #endif
 #if HAVE_SELECT
 #endif
 #if HAVE_SELECT

-  if (select_init (flags))
-    return ev_method;
+  if (ev_method == EVMETHOD_NONE) select_init (flags);

 #endif
 
 #endif
 

-  ev_method = EVMETHOD_NONE;
+  if (ev_method)
+    {
+      evw_init (&sigev, sigcb, 0);
+      siginit ();
+    }
+

   return ev_method;
 }
 
   return ev_method;
 }
 

+/*****************************************************************************/
+

 void ev_prefork (void)
 {
 }
 void ev_prefork (void)
 {
 }


@@ -239,8 +350,16 @@ void ev_postfork_child (void)
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif

+
+  evio_stop (&sigev);
+  close (sigpipe [0]);
+  close (sigpipe [1]);
+  pipe (sigpipe);
+  siginit ();

 }
 
 }
 

+/*****************************************************************************/
+

 static void
 fd_reify (void)
 {
 static void
 fd_reify (void)
 {


@@ -311,7 +430,7 @@ timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now)
           --timercnt; /* maybe pass by reference instead? */
         }
 
           --timercnt; /* maybe pass by reference instead? */
         }
 

-      event ((struct ev_watcher *)w, EV_TIMEOUT);
+      event ((W)w, EV_TIMEOUT);

     }
 }
 
     }
 }
 


@@ -362,13 +481,19 @@ void ev_loop (int flags)
   double block;
   ev_loop_done = flags & EVLOOP_ONESHOT;
 
   double block;
   ev_loop_done = flags & EVLOOP_ONESHOT;
 

+  if (checkcnt)
+    {
+      queue_events ((W *)checks, checkcnt, EV_CHECK);
+      call_pending ();
+    }
+

   do
     {
       /* update fd-related kernel structures */
       fd_reify ();
 
       /* calculate blocking time */
   do
     {
       /* update fd-related kernel structures */
       fd_reify ();
 
       /* calculate blocking time */

-      if (flags & EVLOOP_NONBLOCK)
+      if (flags & EVLOOP_NONBLOCK || idlecnt)

         block = 0.;
       else
         {
         block = 0.;
       else
         {


@@ -394,26 +519,35 @@ void ev_loop (int flags)
       /* update ev_now, do magic */
       time_update ();
 
       /* update ev_now, do magic */
       time_update ();
 

-      /* put pending timers into pendign queue and reschedule them */
+      /* queue pending timers and reschedule them */

       /* absolute timers first */
       timers_reify (atimers, atimercnt, ev_now);
       /* relative timers second */
       timers_reify (rtimers, rtimercnt, now);
 
       /* absolute timers first */
       timers_reify (atimers, atimercnt, ev_now);
       /* relative timers second */
       timers_reify (rtimers, rtimercnt, now);
 

+      /* 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);
+

       call_pending ();
     }
   while (!ev_loop_done);
 }
 
       call_pending ();
     }
   while (!ev_loop_done);
 }
 

+/*****************************************************************************/
+

 static void
 static void

-wlist_add (struct ev_watcher_list **head, struct ev_watcher_list *elem)
+wlist_add (WL *head, WL elem)

 {
   elem->next = *head;
   *head = elem;
 }
 
 static void
 {
   elem->next = *head;
   *head = elem;
 }
 
 static void

-wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem)
+wlist_del (WL *head, WL elem)

 {
   while (*head)
     {
 {
   while (*head)
     {


@@ -428,14 +562,14 @@ wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem)
 }
 
 static void
 }
 
 static void

-ev_start (struct ev_watcher *w, int active)
+ev_start (W w, int active)

 {
   w->pending = 0;
   w->active = active;
 }
 
 static void
 {
   w->pending = 0;
   w->active = active;
 }
 
 static void

-ev_stop (struct ev_watcher *w)
+ev_stop (W w)

 {
   if (w->pending)
     pendings [w->pending - 1].w = 0;
 {
   if (w->pending)
     pendings [w->pending - 1].w = 0;


@@ -444,6 +578,8 @@ ev_stop (struct ev_watcher *w)
   /* nop */
 }
 
   /* nop */
 }
 

+/*****************************************************************************/
+

 void
 evio_start (struct ev_io *w)
 {
 void
 evio_start (struct ev_io *w)
 {


@@ -452,9 +588,9 @@ evio_start (struct ev_io *w)
 
   int fd = w->fd;
 
 
   int fd = w->fd;
 

-  ev_start ((struct ev_watcher *)w, 1);
+  ev_start ((W)w, 1);

   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);

-  wlist_add ((struct ev_watcher_list **)&anfds[fd].head, (struct ev_watcher_list *)w);
+  wlist_add ((WL *)&anfds[fd].head, (WL)w);

 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );
 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );


@@ -467,8 +603,8 @@ evio_stop (struct ev_io *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

-  wlist_del ((struct ev_watcher_list **)&anfds[w->fd].head, (struct ev_watcher_list *)w);
-  ev_stop ((struct ev_watcher *)w);
+  wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
+  ev_stop ((W)w);

 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );
 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );


@@ -487,7 +623,7 @@ evtimer_start (struct ev_timer *w)
       if (w->repeat)
         w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
 
       if (w->repeat)
         w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
 

-      ev_start ((struct ev_watcher *)w, ++atimercnt);
+      ev_start ((W)w, ++atimercnt);

       array_needsize (atimers, atimermax, atimercnt, );
       atimers [atimercnt - 1] = w;
       upheap (atimers, atimercnt - 1);
       array_needsize (atimers, atimermax, atimercnt, );
       atimers [atimercnt - 1] = w;
       upheap (atimers, atimercnt - 1);


@@ -496,7 +632,7 @@ evtimer_start (struct ev_timer *w)
     {
       w->at += now;
 
     {
       w->at += now;
 

-      ev_start ((struct ev_watcher *)w, ++rtimercnt);
+      ev_start ((W)w, ++rtimercnt);

       array_needsize (rtimers, rtimermax, rtimercnt, );
       rtimers [rtimercnt - 1] = w;
       upheap (rtimers, rtimercnt - 1);
       array_needsize (rtimers, rtimermax, rtimercnt, );
       rtimers [rtimercnt - 1] = w;
       upheap (rtimers, rtimercnt - 1);


@@ -527,7 +663,7 @@ evtimer_stop (struct ev_timer *w)
         }
     }
 
         }
     }
 

-  ev_stop ((struct ev_watcher *)w);
+  ev_stop ((W)w);

 }
 
 void
 }
 
 void


@@ -536,9 +672,18 @@ evsignal_start (struct ev_signal *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  ev_start ((struct ev_watcher *)w, 1);
+  ev_start ((W)w, 1);

   array_needsize (signals, signalmax, w->signum, signals_init);
   array_needsize (signals, signalmax, w->signum, signals_init);

-  wlist_add ((struct ev_watcher_list **)&signals [w->signum - 1], (struct ev_watcher_list *)w);
+  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
+
+  if (!w->next)
+    {
+      struct sigaction sa;
+      sa.sa_handler = sighandler;
+      sigfillset (&sa.sa_mask);
+      sa.sa_flags = 0;
+      sigaction (w->signum, &sa, 0);
+    }

 }
 
 void
 }
 
 void


@@ -547,12 +692,48 @@ evsignal_stop (struct ev_signal *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

-  wlist_del ((struct ev_watcher_list **)&signals [w->signum - 1], (struct ev_watcher_list *)w);
-  ev_stop ((struct ev_watcher *)w);
+  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
+  ev_stop ((W)w);
+
+  if (!signals [w->signum - 1].head)
+    signal (w->signum, SIG_DFL);
+}
+
+void evidle_start (struct ev_idle *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, ++idlecnt);
+  array_needsize (idles, idlemax, idlecnt, );
+  idles [idlecnt - 1] = w;
+}
+
+void evidle_stop (struct ev_idle *w)
+{
+  idles [w->active - 1] = idles [--idlecnt];
+  ev_stop ((W)w);
+}
+
+void evcheck_start (struct ev_check *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, ++checkcnt);
+  array_needsize (checks, checkmax, checkcnt, );
+  checks [checkcnt - 1] = w;
+}
+
+void evcheck_stop (struct ev_check *w)
+{
+  checks [w->active - 1] = checks [--checkcnt];
+  ev_stop ((W)w);

 }
 
 /*****************************************************************************/
 }
 
 /*****************************************************************************/

-#if 1
+
+#if 0

 
 static void
 sin_cb (struct ev_io *w, int revents)
 
 static void
 sin_cb (struct ev_io *w, int revents)


@@ -568,6 +749,18 @@ ocb (struct ev_timer *w, int revents)
   evtimer_start (w);
 }
 
   evtimer_start (w);
 }
 

+static void
+scb (struct ev_signal *w, int revents)
+{
+  fprintf (stderr, "signal %x,%d\n", revents, w->signum);
+}
+
+static void
+gcb (struct ev_signal *w, int revents)
+{
+  fprintf (stderr, "generic %x\n", revents);
+}
+

 int main (void)
 {
   struct ev_io sin;
 int main (void)
 {
   struct ev_io sin;


@@ -580,7 +773,7 @@ int main (void)
 
   struct ev_timer t[10000];
 
 
   struct ev_timer t[10000];
 

-#if 1
+#if 0

   int i;
   for (i = 0; i < 10000; ++i)
     {
   int i;
   for (i = 0; i < 10000; ++i)
     {


@@ -598,6 +791,19 @@ int main (void)
   evtimer_set_abs (&t1, 5, 10);
   evtimer_start (&t1);
 
   evtimer_set_abs (&t1, 5, 10);
   evtimer_start (&t1);
 

+  struct ev_signal sig;
+  evw_init (&sig, scb, 65535);
+  evsignal_set (&sig, SIGQUIT);
+  evsignal_start (&sig);
+
+  struct ev_check cw;
+  evw_init (&cw, gcb, 0);
+  evcheck_start (&cw);
+
+  struct ev_idle iw;
+  evw_init (&iw, gcb, 0);
+  evidle_start (&iw);
+

   ev_loop (0);
 
   return 0;
   ev_loop (0);
 
   return 0;