*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index acde504b11cc52579943aafa3605525ea6a164d3..c9ff2f19f279c3265aa64a3c097f3e17b145f663 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -478,7 +478,7 @@ ev_feed_event (EV_P_ void *w, int revents)
     }
 }
 
     }
 }
 

-void inline_size
+void inline_speed

 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;


@@ -640,16 +640,20 @@ upheap (WT *heap, int k)
 {
   WT w = heap [k];
 
 {
   WT w = heap [k];
 

-  while (k && heap [k >> 1]->at > w->at)
+  while (k)

     {
     {

-      heap [k] = heap [k >> 1];
+      int p = (k - 1) >> 1;
+
+      if (heap [p]->at <= w->at)
+        break;
+
+      heap [k] = heap [p];

       ((W)heap [k])->active = k + 1;
       ((W)heap [k])->active = k + 1;

-      k >>= 1;
+      k = p;

     }
 
   heap [k] = w;
   ((W)heap [k])->active = k + 1;
     }
 
   heap [k] = w;
   ((W)heap [k])->active = k + 1;

-

 }
 
 void inline_speed
 }
 
 void inline_speed


@@ -657,19 +661,23 @@ downheap (WT *heap, int N, int k)
 {
   WT w = heap [k];
 
 {
   WT w = heap [k];
 

-  while (k < (N >> 1))
+  for (;;)

     {
     {

-      int j = k << 1;
+      int c = (k << 1) + 1;
+
+      if (c >= N)
+        break;

 
 

-      if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
-        ++j;
+      c += c + 1 < N && heap [c]->at > heap [c + 1]->at
+           ? 1 : 0;

 
 

-      if (w->at <= heap [j]->at)
+      if (w->at <= heap [c]->at)

         break;
 
         break;
 

-      heap [k] = heap [j];
+      heap [k] = heap [c];

       ((W)heap [k])->active = k + 1;
       ((W)heap [k])->active = k + 1;

-      k = j;
+
+      k = c;

     }
 
   heap [k] = w;
     }
 
   heap [k] = w;


@@ -786,7 +794,7 @@ siginit (EV_P)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static ev_child *childs [EV_PID_HASHSIZE];
+static WL childs [EV_PID_HASHSIZE];

 
 #ifndef _WIN32
 
 
 #ifndef _WIN32
 


@@ -1208,7 +1216,7 @@ timers_reify (EV_P)
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
     {
 {
   while (timercnt && ((WT)timers [0])->at <= mn_now)
     {

-      ev_timer *w = timers [0];
+      ev_timer *w = (ev_timer *)timers [0];

 
       /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
 
 
       /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
 


@@ -1221,7 +1229,7 @@ timers_reify (EV_P)
           if (((WT)w)->at < mn_now)
             ((WT)w)->at = mn_now;
 
           if (((WT)w)->at < mn_now)
             ((WT)w)->at = mn_now;
 

-          downheap ((WT *)timers, timercnt, 0);
+          downheap (timers, timercnt, 0);

         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
         }
       else
         ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */


@@ -1236,7 +1244,7 @@ periodics_reify (EV_P)
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
     {
 {
   while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
     {

-      ev_periodic *w = periodics [0];
+      ev_periodic *w = (ev_periodic *)periodics [0];

 
       /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
 
 
       /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
 


@@ -1245,14 +1253,14 @@ periodics_reify (EV_P)
         {
           ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
           assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
         {
           ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
           assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));

-          downheap ((WT *)periodics, periodiccnt, 0);
+          downheap (periodics, periodiccnt, 0);

         }
       else if (w->interval)
         {
           ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
           if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
           assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
         }
       else if (w->interval)
         {
           ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
           if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
           assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));

-          downheap ((WT *)periodics, periodiccnt, 0);
+          downheap (periodics, periodiccnt, 0);

         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
         }
       else
         ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */


@@ -1269,7 +1277,7 @@ periodics_reschedule (EV_P)
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {
   /* adjust periodics after time jump */
   for (i = 0; i < periodiccnt; ++i)
     {

-      ev_periodic *w = periodics [i];
+      ev_periodic *w = (ev_periodic *)periodics [i];

 
       if (w->reschedule_cb)
         ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
 
       if (w->reschedule_cb)
         ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);


@@ -1279,7 +1287,7 @@ periodics_reschedule (EV_P)
 
   /* now rebuild the heap */
   for (i = periodiccnt >> 1; i--; )
 
   /* now rebuild the heap */
   for (i = periodiccnt >> 1; i--; )

-    downheap ((WT *)periodics, periodiccnt, i);
+    downheap (periodics, periodiccnt, i);

 }
 #endif
 
 }
 #endif
 


@@ -1591,7 +1599,7 @@ ev_io_start (EV_P_ ev_io *w)
 
   ev_start (EV_A_ (W)w, 1);
   array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
 
   ev_start (EV_A_ (W)w, 1);
   array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);

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

 
   fd_change (EV_A_ fd);
 }
 
   fd_change (EV_A_ fd);
 }


@@ -1605,7 +1613,7 @@ ev_io_stop (EV_P_ ev_io *w)
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
 
 
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
 

-  wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
+  wlist_del (&anfds[w->fd].head, (WL)w);

   ev_stop (EV_A_ (W)w);
 
   fd_change (EV_A_ w->fd);
   ev_stop (EV_A_ (W)w);
 
   fd_change (EV_A_ w->fd);


@@ -1622,9 +1630,9 @@ ev_timer_start (EV_P_ ev_timer *w)
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
   ev_start (EV_A_ (W)w, ++timercnt);
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
   ev_start (EV_A_ (W)w, ++timercnt);

-  array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
-  timers [timercnt - 1] = w;
-  upheap ((WT *)timers, timercnt - 1);
+  array_needsize (WT, timers, timermax, timercnt, EMPTY2);
+  timers [timercnt - 1] = (WT)w;
+  upheap (timers, timercnt - 1);

 
   /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
 }
 
   /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
 }


@@ -1636,7 +1644,7 @@ ev_timer_stop (EV_P_ ev_timer *w)
   if (expect_false (!ev_is_active (w)))
     return;
 
   if (expect_false (!ev_is_active (w)))
     return;
 

-  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
+  assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));

 
   {
     int active = ((W)w)->active;
 
   {
     int active = ((W)w)->active;


@@ -1644,7 +1652,7 @@ ev_timer_stop (EV_P_ ev_timer *w)
     if (expect_true (--active < --timercnt))
       {
         timers [active] = timers [timercnt];
     if (expect_true (--active < --timercnt))
       {
         timers [active] = timers [timercnt];

-        adjustheap ((WT *)timers, timercnt, active);
+        adjustheap (timers, timercnt, active);

       }
   }
 
       }
   }
 


@@ -1661,7 +1669,7 @@ ev_timer_again (EV_P_ ev_timer *w)
       if (w->repeat)
         {
           ((WT)w)->at = mn_now + w->repeat;
       if (w->repeat)
         {
           ((WT)w)->at = mn_now + w->repeat;

-          adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
+          adjustheap (timers, timercnt, ((W)w)->active - 1);

         }
       else
         ev_timer_stop (EV_A_ w);
         }
       else
         ev_timer_stop (EV_A_ w);


@@ -1692,9 +1700,9 @@ ev_periodic_start (EV_P_ ev_periodic *w)
     ((WT)w)->at = w->offset;
 
   ev_start (EV_A_ (W)w, ++periodiccnt);
     ((WT)w)->at = w->offset;
 
   ev_start (EV_A_ (W)w, ++periodiccnt);

-  array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
-  periodics [periodiccnt - 1] = w;
-  upheap ((WT *)periodics, periodiccnt - 1);
+  array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
+  periodics [periodiccnt - 1] = (WT)w;
+  upheap (periodics, periodiccnt - 1);

 
   /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
 }
 
   /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
 }


@@ -1706,7 +1714,7 @@ ev_periodic_stop (EV_P_ ev_periodic *w)
   if (expect_false (!ev_is_active (w)))
     return;
 
   if (expect_false (!ev_is_active (w)))
     return;
 

-  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
+  assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));

 
   {
     int active = ((W)w)->active;
 
   {
     int active = ((W)w)->active;


@@ -1714,7 +1722,7 @@ ev_periodic_stop (EV_P_ ev_periodic *w)
     if (expect_true (--active < --periodiccnt))
       {
         periodics [active] = periodics [periodiccnt];
     if (expect_true (--active < --periodiccnt))
       {
         periodics [active] = periodics [periodiccnt];

-        adjustheap ((WT *)periodics, periodiccnt, active);
+        adjustheap (periodics, periodiccnt, active);

       }
   }
 
       }
   }
 


@@ -1745,9 +1753,22 @@ ev_signal_start (EV_P_ ev_signal *w)
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
 
 
   assert (("ev_signal_start called with illegal signal number", w->signum > 0));
 

+  {
+#ifndef _WIN32
+    sigset_t full, prev;
+    sigfillset (&full);
+    sigprocmask (SIG_SETMASK, &full, &prev);
+#endif
+
+    array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
+
+#ifndef _WIN32
+    sigprocmask (SIG_SETMASK, &prev, 0);
+#endif
+  }
+

   ev_start (EV_A_ (W)w, 1);
   ev_start (EV_A_ (W)w, 1);

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

 
   if (!((WL)w)->next)
     {
 
   if (!((WL)w)->next)
     {


@@ -1770,7 +1791,7 @@ ev_signal_stop (EV_P_ ev_signal *w)
   if (expect_false (!ev_is_active (w)))
     return;
 
   if (expect_false (!ev_is_active (w)))
     return;
 

-  wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
+  wlist_del (&signals [w->signum - 1].head, (WL)w);

   ev_stop (EV_A_ (W)w);
 
   if (!signals [w->signum - 1].head)
   ev_stop (EV_A_ (W)w);
 
   if (!signals [w->signum - 1].head)


@@ -1787,7 +1808,7 @@ ev_child_start (EV_P_ ev_child *w)
     return;
 
   ev_start (EV_A_ (W)w, 1);
     return;
 
   ev_start (EV_A_ (W)w, 1);

-  wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
+  wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);

 }
 
 void
 }
 
 void


@@ -1797,7 +1818,7 @@ ev_child_stop (EV_P_ ev_child *w)
   if (expect_false (!ev_is_active (w)))
     return;
 
   if (expect_false (!ev_is_active (w)))
     return;
 

-  wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
+  wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);

   ev_stop (EV_A_ (W)w);
 }
 
   ev_stop (EV_A_ (W)w);
 }