*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 9f35287c51097b94a498ad212fb0a5b4b2582373..7995b34005258fadf4a96db371db620f17a8f822 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -1,4 +1,6 @@
 /*
 /*

+ * libev event processing core, watcher management
+ *

  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *
  * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
  * All rights reserved.
  *


@@ -141,7 +143,8 @@ get_clock (void)
 typedef struct
 {
   struct ev_io *head;
 typedef struct
 {
   struct ev_io *head;

-  int events;
+  unsigned char events;
+  unsigned char reify;

 } ANFD;
 
 static ANFD *anfds;
 } ANFD;
 
 static ANFD *anfds;


@@ -154,6 +157,8 @@ anfds_init (ANFD *base, int count)
     {
       base->head   = 0;
       base->events = EV_NONE;
     {
       base->head   = 0;
       base->events = EV_NONE;

+      base->reify  = 0;
+

       ++base;
     }
 }
       ++base;
     }
 }


@@ -170,6 +175,12 @@ static int pendingmax, pendingcnt;
 static void
 event (W w, int events)
 {
 static void
 event (W w, int events)
 {

+  if (w->pending)
+    {
+      pendings [w->pending - 1].events |= events;
+      return;
+    }
+

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


@@ -221,7 +232,7 @@ fd_reify (void)
       for (w = anfd->head; w; w = w->next)
         events |= w->events;
 
       for (w = anfd->head; w; w = w->next)
         events |= w->events;
 

-      anfd->events &= ~EV_REIFY;
+      anfd->reify = 0;

 
       if (anfd->events != events)
         {
 
       if (anfd->events != events)
         {


@@ -236,10 +247,10 @@ fd_reify (void)
 static void
 fd_change (int fd)
 {
 static void
 fd_change (int fd)
 {

-  if (anfds [fd].events & EV_REIFY || fdchangecnt < 0)
+  if (anfds [fd].reify || fdchangecnt < 0)

     return;
 
     return;
 

-  anfds [fd].events |= EV_REIFY;
+  anfds [fd].reify = 1;

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


@@ -257,8 +268,8 @@ fd_recheck (void)
       if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
         while (anfds [fd].head)
           {
       if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
         while (anfds [fd].head)
           {

-            event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT);

             ev_io_stop (anfds [fd].head);
             ev_io_stop (anfds [fd].head);

+            event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE);

           }
 }
 
           }
 }
 


@@ -316,14 +327,14 @@ downheap (WT *timers, int N, int k)
 typedef struct
 {
   struct ev_signal *head;
 typedef struct
 {
   struct ev_signal *head;

-  sig_atomic_t gotsig;
+  sig_atomic_t volatile gotsig;

 } ANSIG;
 
 static ANSIG *signals;
 static int signalmax;
 
 static int sigpipe [2];
 } ANSIG;
 
 static ANSIG *signals;
 static int signalmax;
 
 static int sigpipe [2];

-static sig_atomic_t gotsig;
+static sig_atomic_t volatile gotsig;

 static struct ev_io sigev;
 
 static void
 static struct ev_io sigev;
 
 static void


@@ -333,6 +344,7 @@ signals_init (ANSIG *base, int count)
     {
       base->head   = 0;
       base->gotsig = 0;
     {
       base->head   = 0;
       base->gotsig = 0;

+

       ++base;
     }
 }
       ++base;
     }
 }


@@ -345,7 +357,7 @@ sighandler (int signum)
   if (!gotsig)
     {
       gotsig = 1;
   if (!gotsig)
     {
       gotsig = 1;

-      write (sigpipe [1], &gotsig, 1);
+      write (sigpipe [1], &signum, 1);

     }
 }
 
     }
 }
 


@@ -355,8 +367,8 @@ sigcb (struct ev_io *iow, int revents)
   struct ev_signal *w;
   int sig;
 
   struct ev_signal *w;
   int sig;
 

-  gotsig = 0;

   read (sigpipe [0], &revents, 1);
   read (sigpipe [0], &revents, 1);

+  gotsig = 0;

 
   for (sig = signalmax; sig--; )
     if (signals [sig].gotsig)
 
   for (sig = signalmax; sig--; )
     if (signals [sig].gotsig)


@@ -481,19 +493,19 @@ int ev_init (int flags)
 /*****************************************************************************/
 
 void
 /*****************************************************************************/
 
 void

-ev_prefork (void)
+ev_fork_prepare (void)

 {
   /* nop */
 }
 
 void
 {
   /* nop */
 }
 
 void

-ev_postfork_parent (void)
+ev_fork_parent (void)

 {
   /* nop */
 }
 
 void
 {
   /* nop */
 }
 
 void

-ev_postfork_child (void)
+ev_fork_child (void)

 {
 #if EV_USE_EPOLL
   if (ev_method == EVMETHOD_EPOLL)
 {
 #if EV_USE_EPOLL
   if (ev_method == EVMETHOD_EPOLL)


@@ -534,8 +546,8 @@ timers_reify (void)
       /* first reschedule or stop timer */
       if (w->repeat)
         {
       /* first reschedule or stop timer */
       if (w->repeat)
         {

+          assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));

           w->at = now + w->repeat;
           w->at = now + w->repeat;

-          assert (("timer timeout in the past, negative repeat?", w->at > now));

           downheap ((WT *)timers, timercnt, 0);
         }
       else
           downheap ((WT *)timers, timercnt, 0);
         }
       else


@@ -556,13 +568,13 @@ periodics_reify (void)
       if (w->interval)
         {
           w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
       if (w->interval)
         {
           w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;

-          assert (("periodic timeout in the past, negative interval?", w->at > ev_now));
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
         ev_periodic_stop (w); /* nonrepeating: stop timer */
 
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
         ev_periodic_stop (w); /* nonrepeating: stop timer */
 

-      event ((W)w, EV_TIMEOUT);
+      event ((W)w, EV_PERIODIC);

     }
 }
 
     }
 }
 


@@ -727,7 +739,7 @@ wlist_del (WL *head, WL elem)
 }
 
 static void
 }
 
 static void

-ev_clear (W w)
+ev_clear_pending (W w)

 {
   if (w->pending)
     {
 {
   if (w->pending)
     {


@@ -758,6 +770,8 @@ ev_io_start (struct ev_io *w)
 
   int fd = w->fd;
 
 
   int fd = w->fd;
 

+  assert (("ev_io_start called with negative fd", fd >= 0));
+

   ev_start ((W)w, 1);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
   ev_start ((W)w, 1);
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);


@@ -768,7 +782,7 @@ ev_io_start (struct ev_io *w)
 void
 ev_io_stop (struct ev_io *w)
 {
 void
 ev_io_stop (struct ev_io *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 


@@ -786,7 +800,7 @@ ev_timer_start (struct ev_timer *w)
 
   w->at += now;
 
 
   w->at += now;
 

-  assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));
+  assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));

 
   ev_start ((W)w, ++timercnt);
   array_needsize (timers, timermax, timercnt, );
 
   ev_start ((W)w, ++timercnt);
   array_needsize (timers, timermax, timercnt, );


@@ -797,7 +811,7 @@ ev_timer_start (struct ev_timer *w)
 void
 ev_timer_stop (struct ev_timer *w)
 {
 void
 ev_timer_stop (struct ev_timer *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 


@@ -835,7 +849,7 @@ ev_periodic_start (struct ev_periodic *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
+  assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));

 
   /* this formula differs from the one in periodic_reify because we do not always round up */
   if (w->interval)
 
   /* this formula differs from the one in periodic_reify because we do not always round up */
   if (w->interval)


@@ -850,7 +864,7 @@ ev_periodic_start (struct ev_periodic *w)
 void
 ev_periodic_stop (struct ev_periodic *w)
 {
 void
 ev_periodic_stop (struct ev_periodic *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 


@@ -869,6 +883,8 @@ ev_signal_start (struct ev_signal *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

+  assert (("ev_signal_start called with illegal signal number", w->signum > 0));
+

   ev_start ((W)w, 1);
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
   ev_start ((W)w, 1);
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);


@@ -886,7 +902,7 @@ ev_signal_start (struct ev_signal *w)
 void
 ev_signal_stop (struct ev_signal *w)
 {
 void
 ev_signal_stop (struct ev_signal *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 


@@ -911,7 +927,7 @@ ev_idle_start (struct ev_idle *w)
 void
 ev_idle_stop (struct ev_idle *w)
 {
 void
 ev_idle_stop (struct ev_idle *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 


@@ -933,7 +949,7 @@ ev_prepare_start (struct ev_prepare *w)
 void
 ev_prepare_stop (struct ev_prepare *w)
 {
 void
 ev_prepare_stop (struct ev_prepare *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 


@@ -955,7 +971,7 @@ ev_check_start (struct ev_check *w)
 void
 ev_check_stop (struct ev_check *w)
 {
 void
 ev_check_stop (struct ev_check *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 


@@ -976,7 +992,7 @@ ev_child_start (struct ev_child *w)
 void
 ev_child_stop (struct ev_child *w)
 {
 void
 ev_child_stop (struct ev_child *w)
 {

-  ev_clear ((W)w);
+  ev_clear_pending ((W)w);

   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;