*** empty log message ***

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 97a99d27f04e7ba273142b914846fe2a5fb5e997..53491e1130c6c2c7093b1fd52d7f213ac2a32cd4 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -30,6 +30,28 @@
  */
 #ifndef EV_STANDALONE
 # include "config.h"
  */
 #ifndef EV_STANDALONE
 # include "config.h"

+
+# if HAVE_CLOCK_GETTIME
+#  define EV_USE_MONOTONIC 1
+#  define EV_USE_REALTIME  1
+# endif
+
+# if HAVE_SELECT && HAVE_SYS_SELECT_H
+#  define EV_USE_SELECT 1
+# endif
+
+# if HAVE_POLL && HAVE_POLL_H
+#  define EV_USE_POLL 1
+# endif
+
+# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
+#  define EV_USE_EPOLL 1
+# endif
+
+# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
+#  define EV_USE_KQUEUE 1
+# endif
+

 #endif
 
 #include <math.h>
 #endif
 
 #include <math.h>


@@ -72,6 +94,14 @@
 # define EV_USE_KQUEUE 0
 #endif
 
 # define EV_USE_KQUEUE 0
 #endif
 

+#ifndef EV_USE_WIN32
+# ifdef WIN32
+#  define EV_USE_WIN32 1
+# else
+#  define EV_USE_WIN32 0
+# endif
+#endif
+

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


@@ -117,6 +147,12 @@ typedef struct ev_watcher_time *WT;
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 
 
 static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
 

+#if WIN32
+/* note: the comment below could not be substantiated, but what would I care */
+/* MSDN says this is required to handle SIGFPE */
+volatile double SIGFPE_REQ = 0.0f; 
+#endif
+

 /*****************************************************************************/
 
 typedef struct
 /*****************************************************************************/
 
 typedef struct


@@ -204,6 +240,17 @@ ev_now (EV_P)
       cur = newcnt;                                    \
     }
 
       cur = newcnt;                                    \
     }
 

+#define array_slim(stem)                                       \
+  if (stem ## max < array_roundsize (stem ## cnt >> 2))                \
+    {                                                          \
+      stem ## max = array_roundsize (stem ## cnt >> 1);                \
+      base = realloc (base, sizeof (*base) * (stem ## max));   \
+      fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
+    }
+
+#define array_free(stem, idx) \
+  free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
+

 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void


@@ -278,11 +325,8 @@ fd_reify (EV_P)
 
       anfd->reify = 0;
 
 
       anfd->reify = 0;
 

-      if (anfd->events != events)
-        {
-          method_modify (EV_A_ fd, anfd->events, events);
-          anfd->events = events;
-        }
+      method_modify (EV_A_ fd, anfd->events, events);
+      anfd->events = events;

     }
 
   fdchangecnt = 0;
     }
 
   fdchangecnt = 0;


@@ -329,9 +373,9 @@ fd_ebadf (EV_P)
 static void
 fd_enomem (EV_P)
 {
 static void
 fd_enomem (EV_P)
 {

-  int fd = anfdmax;
+  int fd;

 
 

-  while (fd--)
+  for (fd = anfdmax; fd--; )

     if (anfds [fd].events)
       {
         close (fd);
     if (anfds [fd].events)
       {
         close (fd);


@@ -351,7 +395,7 @@ fd_rearm_all (EV_P)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;

-        fd_change (fd);
+        fd_change (EV_A_ fd);

       }
 }
 
       }
 }
 


@@ -365,12 +409,12 @@ upheap (WT *heap, int k)
   while (k && heap [k >> 1]->at > w->at)
     {
       heap [k] = heap [k >> 1];
   while (k && heap [k >> 1]->at > w->at)
     {
       heap [k] = heap [k >> 1];

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

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

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

 
 }
 
 
 }
 


@@ -390,12 +434,12 @@ downheap (WT *heap, int N, int k)
         break;
 
       heap [k] = heap [j];
         break;
 
       heap [k] = heap [j];

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

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

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

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


@@ -428,6 +472,10 @@ signals_init (ANSIG *base, int count)
 static void
 sighandler (int signum)
 {
 static void
 sighandler (int signum)
 {

+#if WIN32
+  signal (signum, sighandler);
+#endif
+

   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)
   signals [signum - 1].gotsig = 1;
 
   if (!gotsig)


@@ -494,9 +542,9 @@ child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
   for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {
   for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
     if (w->pid == pid || !w->pid)
       {

-        w->priority = sw->priority; /* need to do it *now* */
-        w->rpid     = pid;
-        w->rstatus  = status;
+        ev_priority (w) = ev_priority (sw); /* need to do it *now* */
+        w->rpid         = pid;
+        w->rstatus      = status;

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


@@ -588,6 +636,9 @@ loop_init (EV_P_ int methods)
           methods = EVMETHOD_ANY;
 
       method = 0;
           methods = EVMETHOD_ANY;
 
       method = 0;

+#if EV_USE_WIN32
+      if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init  (EV_A_ methods);
+#endif

 #if EV_USE_KQUEUE
       if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
 #endif
 #if EV_USE_KQUEUE
       if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
 #endif


@@ -606,6 +657,11 @@ loop_init (EV_P_ int methods)
 void
 loop_destroy (EV_P)
 {
 void
 loop_destroy (EV_P)
 {

+  int i;
+
+#if EV_USE_WIN32
+  if (method == EVMETHOD_WIN32 ) win32_destroy  (EV_A);
+#endif

 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif
 #if EV_USE_KQUEUE
   if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
 #endif


@@ -619,6 +675,16 @@ loop_destroy (EV_P)
   if (method == EVMETHOD_SELECT) select_destroy (EV_A);
 #endif
 
   if (method == EVMETHOD_SELECT) select_destroy (EV_A);
 #endif
 

+  for (i = NUMPRI; i--; )
+    array_free (pending, [i]);
+
+  array_free (fdchange, );
+  array_free (timer, );
+  array_free (periodic, );
+  array_free (idle, );
+  array_free (prepare, );
+  array_free (check, );
+

   method = 0;
   /*TODO*/
 }
   method = 0;
   /*TODO*/
 }


@@ -643,7 +709,7 @@ ev_loop_new (int methods)
 
   loop_init (EV_A_ methods);
 
 
   loop_init (EV_A_ methods);
 

-  if (ev_methods (EV_A))
+  if (ev_method (EV_A))

     return loop;
 
   return 0;
     return loop;
 
   return 0;


@@ -730,8 +796,12 @@ ev_default_destroy (void)
 }
 
 void
 }
 
 void

-ev_default_fork (EV_P)
+ev_default_fork (void)

 {
 {

+#if EV_MULTIPLICITY
+  struct ev_loop *loop = default_loop;
+#endif
+

   loop_fork (EV_A);
 
   ev_io_stop (EV_A_ &sigev);
   loop_fork (EV_A);
 
   ev_io_stop (EV_A_ &sigev);


@@ -766,15 +836,17 @@ call_pending (EV_P)
 static void
 timers_reify (EV_P)
 {
 static void
 timers_reify (EV_P)
 {

-  while (timercnt && timers [0]->at <= mn_now)
+  while (timercnt && ((WT)timers [0])->at <= mn_now)

     {
       struct ev_timer *w = timers [0];
 
     {
       struct ev_timer *w = timers [0];
 

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

       /* first reschedule or stop timer */
       if (w->repeat)
         {
           assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
       /* first reschedule or stop timer */
       if (w->repeat)
         {
           assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));

-          w->at = mn_now + w->repeat;
+          ((WT)w)->at = mn_now + w->repeat;

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


@@ -787,15 +859,17 @@ timers_reify (EV_P)
 static void
 periodics_reify (EV_P)
 {
 static void
 periodics_reify (EV_P)
 {

-  while (periodiccnt && periodics [0]->at <= rt_now)
+  while (periodiccnt && ((WT)periodics [0])->at <= rt_now)

     {
       struct ev_periodic *w = periodics [0];
 
     {
       struct ev_periodic *w = periodics [0];
 

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

       /* first reschedule or stop timer */
       if (w->interval)
         {
       /* first reschedule or stop timer */
       if (w->interval)
         {

-          w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
-          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
+          ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
+          assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));

           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else


@@ -817,7 +891,7 @@ periodics_reschedule (EV_P)
 
       if (w->interval)
         {
 
       if (w->interval)
         {

-          ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
+          ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;

 
           if (fabs (diff) >= 1e-4)
             {
 
           if (fabs (diff) >= 1e-4)
             {


@@ -888,7 +962,7 @@ time_update (EV_P)
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)
 
           /* adjust timers. this is easy, as the offset is the same for all */
           for (i = 0; i < timercnt; ++i)

-            timers [i]->at += rt_now - mn_now;
+            ((WT)timers [i])->at += rt_now - mn_now;

         }
 
       mn_now = rt_now;
         }
 
       mn_now = rt_now;


@@ -949,13 +1023,13 @@ ev_loop (EV_P_ int flags)
 
           if (timercnt)
             {
 
           if (timercnt)
             {

-              ev_tstamp to = timers [0]->at - mn_now + method_fudge;
+              ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;

               if (block > to) block = to;
             }
 
           if (periodiccnt)
             {
               if (block > to) block = to;
             }
 
           if (periodiccnt)
             {

-              ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
+              ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;

               if (block > to) block = to;
             }
 
               if (block > to) block = to;
             }
 


@@ -1082,7 +1156,7 @@ ev_timer_start (EV_P_ struct ev_timer *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  w->at += mn_now;
+  ((WT)w)->at += mn_now;

 
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 
 
   assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
 


@@ -1090,6 +1164,8 @@ ev_timer_start (EV_P_ struct ev_timer *w)
   array_needsize (timers, timermax, timercnt, );
   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);
   array_needsize (timers, timermax, timercnt, );
   timers [timercnt - 1] = w;
   upheap ((WT *)timers, timercnt - 1);

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

 }
 
 void
 }
 
 void


@@ -1099,13 +1175,15 @@ ev_timer_stop (EV_P_ struct ev_timer *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

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

     {
     {

-      timers [w->active - 1] = timers [timercnt];
-      downheap ((WT *)timers, timercnt, w->active - 1);
+      timers [((W)w)->active - 1] = timers [timercnt];
+      downheap ((WT *)timers, timercnt, ((W)w)->active - 1);

     }
 
     }
 

-  w->at = w->repeat;
+  ((WT)w)->at = w->repeat;

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


@@ -1117,8 +1195,8 @@ ev_timer_again (EV_P_ struct ev_timer *w)
     {
       if (w->repeat)
         {
     {
       if (w->repeat)
         {

-          w->at = mn_now + w->repeat;
-          downheap ((WT *)timers, timercnt, w->active - 1);
+          ((WT)w)->at = mn_now + w->repeat;
+          downheap ((WT *)timers, timercnt, ((W)w)->active - 1);

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


@@ -1137,12 +1215,14 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
 
   /* 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)

-    w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
+    ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;

 
   ev_start (EV_A_ (W)w, ++periodiccnt);
   array_needsize (periodics, periodicmax, periodiccnt, );
   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);
 
   ev_start (EV_A_ (W)w, ++periodiccnt);
   array_needsize (periodics, periodicmax, periodiccnt, );
   periodics [periodiccnt - 1] = w;
   upheap ((WT *)periodics, periodiccnt - 1);

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

 }
 
 void
 }
 
 void


@@ -1152,10 +1232,12 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

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

     {
     {

-      periodics [w->active - 1] = periodics [periodiccnt];
-      downheap ((WT *)periodics, periodiccnt, w->active - 1);
+      periodics [((W)w)->active - 1] = periodics [periodiccnt];
+      downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);

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


@@ -1179,7 +1261,7 @@ ev_idle_stop (EV_P_ struct ev_idle *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  idles [w->active - 1] = idles [--idlecnt];
+  idles [((W)w)->active - 1] = idles [--idlecnt];

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


@@ -1201,7 +1283,7 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  prepares [w->active - 1] = prepares [--preparecnt];
+  prepares [((W)w)->active - 1] = prepares [--preparecnt];

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


@@ -1223,7 +1305,7 @@ ev_check_stop (EV_P_ struct ev_check *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

-  checks [w->active - 1] = checks [--checkcnt];
+  checks [((W)w)->active - 1] = checks [--checkcnt];

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


@@ -1246,13 +1328,17 @@ ev_signal_start (EV_P_ struct ev_signal *w)
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
 
   array_needsize (signals, signalmax, w->signum, signals_init);
   wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
 

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

     {
     {

+#if WIN32
+      signal (w->signum, sighandler);
+#else

       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
       sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);
       struct sigaction sa;
       sa.sa_handler = sighandler;
       sigfillset (&sa.sa_mask);
       sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
       sigaction (w->signum, &sa, 0);

+#endif

     }
 }
 
     }
 }