rmeove remaining debugging code

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index 5b59ae1d71ff2e9944e9a08891dadd15c1ec81ef..aefc9dfc3da7c5b9453f9168721dfff56ccffafc 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -11,26 +11,34 @@
 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 

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

 #endif
 
 #endif
 

-#define HAVE_REALTIME 1
-#define HAVE_EPOLL 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.
 
 #include "ev.h"
 
 
 #define MIN_TIMEJUMP  1. /* minimum timejump that gets detected (if monotonic clock available) */
 #define MAX_BLOCKTIME 60.
 
 #include "ev.h"
 

-struct ev_watcher {
-  EV_WATCHER (ev_watcher);
-};
-
-struct ev_watcher_list {
-  EV_WATCHER_LIST (ev_watcher_list);
-};
+typedef struct ev_watcher *W;
+typedef struct ev_watcher_list *WL;
+typedef struct ev_watcher_time *WT;

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


@@ -77,7 +85,6 @@ get_clock (void)
   if ((cnt) > cur)                                     \
     {                                                  \
       int newcnt = cur ? cur << 1 : 16;                        \
   if ((cnt) > cur)                                     \
     {                                                  \
       int newcnt = cur ? cur << 1 : 16;                        \

-      fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\

       base = realloc (base, sizeof (*base) * (newcnt));        \
       init (base + cur, newcnt - cur);                 \
       cur = newcnt;                                    \
       base = realloc (base, sizeof (*base) * (newcnt));        \
       init (base + cur, newcnt - cur);                 \
       cur = newcnt;                                    \


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

-  struct ev_watcher *w;
+  W w;

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


@@ -118,7 +125,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, );


@@ -137,12 +144,12 @@ 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
     }
 }
 
 static void

-queue_events (struct ev_watcher **events, int eventcnt, int type)
+queue_events (W *events, int eventcnt, int type)

 {
   int i;
 
 {
   int i;
 


@@ -152,16 +159,16 @@ queue_events (struct ev_watcher **events, int eventcnt, int type)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-static struct ev_timer **atimers;
-static int atimermax, atimercnt;
+static struct ev_timer **timers;
+static int timermax, timercnt;

 
 

-static struct ev_timer **rtimers;
-static int rtimermax, rtimercnt;
+static struct ev_periodic **periodics;
+static int periodicmax, periodiccnt;

 
 static void
 
 static void

-upheap (struct ev_timer **timers, int k)
+upheap (WT *timers, int k)

 {
 {

-  struct ev_timer *w = timers [k];
+  WT w = timers [k];

 
   while (k && timers [k >> 1]->at > w->at)
     {
 
   while (k && timers [k >> 1]->at > w->at)
     {


@@ -176,9 +183,9 @@ upheap (struct ev_timer **timers, int k)
 }
 
 static void
 }
 
 static void

-downheap (struct ev_timer **timers, int N, int k)
+downheap (WT *timers, int N, int k)

 {
 {

-  struct ev_timer *w = timers [k];
+  WT w = timers [k];

 
   while (k < (N >> 1))
     {
 
   while (k < (N >> 1))
     {


@@ -252,7 +259,7 @@ sigcb (struct ev_io *iow, int revents)
         signals [sig].gotsig = 0;
 
         for (w = signals [sig].head; w; w = w->next)
         signals [sig].gotsig = 0;
 
         for (w = signals [sig].head; w; w = w->next)

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

       }
 }
 
       }
 }
 


@@ -314,7 +321,7 @@ int ev_init (int flags)
 
   if (ev_method)
     {
 
   if (ev_method)
     {

-      evw_init (&sigev, sigcb, 0);
+      evw_init (&sigev, sigcb);

       siginit ();
     }
 
       siginit ();
     }
 


@@ -325,10 +332,12 @@ int ev_init (int flags)
 
 void ev_prefork (void)
 {
 
 void ev_prefork (void)
 {

+  /* nop */

 }
 
 void ev_postfork_parent (void)
 {
 }
 
 void ev_postfork_parent (void)
 {

+  /* nop */

 }
 
 void ev_postfork_child (void)
 }
 
 void ev_postfork_child (void)


@@ -393,7 +402,7 @@ call_pending ()
 }
 
 static void
 }
 
 static void

-timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now)
+timers_reify ()

 {
   while (timercnt && timers [0]->at <= now)
     {
 {
   while (timercnt && timers [0]->at <= now)
     {


@@ -402,22 +411,60 @@ timers_reify (struct ev_timer **timers, int timercnt, ev_tstamp now)
       /* first reschedule or stop timer */
       if (w->repeat)
         {
       /* first reschedule or stop timer */
       if (w->repeat)
         {

-          if (w->is_abs)
-            w->at += floor ((now - w->at) / w->repeat + 1.) * w->repeat;
-          else
-            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
+        evtimer_stop (w); /* nonrepeating: stop timer */

 
 

-          assert (w->at > now);
+      event ((W)w, EV_TIMEOUT);
+    }
+}

 
 

-          downheap (timers, timercnt, 0);
+static void
+periodics_reify ()
+{
+  while (periodiccnt && periodics [0]->at <= ev_now)
+    {
+      struct ev_periodic *w = periodics [0];
+
+      /* first reschedule or stop timer */
+      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));
+          downheap ((WT *)periodics, periodiccnt, 0);

         }
       else
         }
       else

+        evperiodic_stop (w); /* nonrepeating: stop timer */
+
+      event ((W)w, EV_TIMEOUT);
+    }
+}
+
+static void
+periodics_reschedule (ev_tstamp diff)
+{
+  int i;
+
+  /* adjust periodics after time jump */
+  for (i = 0; i < periodiccnt; ++i)
+    {
+      struct ev_periodic *w = periodics [i];
+
+      if (w->interval)

         {
         {

-          evtimer_stop (w); /* nonrepeating: stop timer */
-          --timercnt; /* maybe pass by reference instead? */
-        }
+          ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
+
+          if (fabs (diff) >= 1e-4)
+            {
+              evperiodic_stop (w);
+              evperiodic_start (w);

 
 

-      event ((struct ev_watcher *)w, EV_TIMEOUT);
+              i = 0; /* restart loop, inefficient, but time jumps should be rare */
+            }
+        }

     }
 }
 
     }
 }
 


@@ -425,14 +472,14 @@ static void
 time_update ()
 {
   int i;
 time_update ()
 {
   int i;

+

   ev_now = ev_time ();
 
   if (have_monotonic)
     {
       ev_tstamp odiff = diff;
 
   ev_now = ev_time ();
 
   if (have_monotonic)
     {
       ev_tstamp odiff = diff;
 

-      /* detecting time jumps is much more difficult */
-      for (i = 2; --i; ) /* loop a few times, before making important decisions */
+      for (i = 4; --i; ) /* loop a few times, before making important decisions */

         {
           now = get_clock ();
           diff = ev_now - now;
         {
           now = get_clock ();
           diff = ev_now - now;


@@ -443,19 +490,19 @@ time_update ()
           ev_now = ev_time ();
         }
 
           ev_now = ev_time ();
         }
 

-      /* time jump detected, reschedule atimers */
-      for (i = 0; i < atimercnt; ++i)
-        {
-          struct ev_timer *w = atimers [i];
-          w->at += ceil ((ev_now - w->at) / w->repeat + 1.) * w->repeat;
-        }
+      periodics_reschedule (diff - odiff);
+      /* no timer adjustment, as the monotonic clock doesn't jump */

     }
   else
     {
       if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
     }
   else
     {
       if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)

-        /* time jump detected, adjust rtimers */
-        for (i = 0; i < rtimercnt; ++i)
-          rtimers [i]->at += ev_now - now;
+        {
+          periodics_reschedule (ev_now - now);
+
+          /* adjust timers. this is easy, as the offset is the same for all */
+          for (i = 0; i < timercnt; ++i)
+            timers [i]->at += diff;
+        }

 
       now = ev_now;
     }
 
       now = ev_now;
     }


@@ -466,11 +513,11 @@ int ev_loop_done;
 void ev_loop (int flags)
 {
   double block;
 void ev_loop (int flags)
 {
   double block;

-  ev_loop_done = flags & EVLOOP_ONESHOT;
+  ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;

 
   if (checkcnt)
     {
 
   if (checkcnt)
     {

-      queue_events (checks, checkcnt, EV_CHECK);
+      queue_events ((W *)checks, checkcnt, EV_CHECK);

       call_pending ();
     }
 
       call_pending ();
     }
 


@@ -480,21 +527,25 @@ void ev_loop (int flags)
       fd_reify ();
 
       /* calculate blocking time */
       fd_reify ();
 
       /* calculate blocking time */

+
+      /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
+      ev_now = ev_time ();
+

       if (flags & EVLOOP_NONBLOCK || idlecnt)
         block = 0.;
       else
         {
           block = MAX_BLOCKTIME;
 
       if (flags & EVLOOP_NONBLOCK || idlecnt)
         block = 0.;
       else
         {
           block = MAX_BLOCKTIME;
 

-          if (rtimercnt)
+          if (timercnt)

             {
             {

-              ev_tstamp to = rtimers [0]->at - get_clock () + method_fudge;
+              ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge;

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

-          if (atimercnt)
+          if (periodiccnt)

             {
             {

-              ev_tstamp to = atimers [0]->at - ev_time   () + method_fudge;
+              ev_tstamp to = periodics [0]->at - ev_now + method_fudge;

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


@@ -507,34 +558,35 @@ void ev_loop (int flags)
       time_update ();
 
       /* queue pending timers and reschedule them */
       time_update ();
 
       /* queue pending timers and reschedule them */

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

 
       /* queue idle watchers unless io or timers are pending */
       if (!pendingcnt)
 
       /* queue idle watchers unless io or timers are pending */
       if (!pendingcnt)

-        queue_events (idles, idlecnt, EV_IDLE);
+        queue_events ((W *)idles, idlecnt, EV_IDLE);

 
       /* queue check and possibly idle watchers */
 
       /* queue check and possibly idle watchers */

-      queue_events (checks, checkcnt, EV_CHECK);
+      queue_events ((W *)checks, checkcnt, EV_CHECK);

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

+
+  if (ev_loop_done != 2)
+    ev_loop_done = 0;

 }
 
 /*****************************************************************************/
 
 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)
     {


@@ -549,20 +601,19 @@ 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;
 
   w->active = 0;
 {
   if (w->pending)
     pendings [w->pending - 1].w = 0;
 
   w->active = 0;

-  /* nop */

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


@@ -575,9 +626,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, );


@@ -590,41 +641,29 @@ 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, );
   fdchanges [fdchangecnt - 1] = w->fd;
 }
 
 
   ++fdchangecnt;
   array_needsize (fdchanges, fdchangemax, fdchangecnt, );
   fdchanges [fdchangecnt - 1] = w->fd;
 }
 

+

 void
 evtimer_start (struct ev_timer *w)
 {
   if (ev_is_active (w))
     return;
 
 void
 evtimer_start (struct ev_timer *w)
 {
   if (ev_is_active (w))
     return;
 

-  if (w->is_abs)
-    {
-      /* this formula differs from the one in timer_reify becuse we do not round up */
-      if (w->repeat)
-        w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
-
-      ev_start ((struct ev_watcher *)w, ++atimercnt);
-      array_needsize (atimers, atimermax, atimercnt, );
-      atimers [atimercnt - 1] = w;
-      upheap (atimers, atimercnt - 1);
-    }
-  else
-    {
-      w->at += now;
+  w->at += now;

 
 

-      ev_start ((struct ev_watcher *)w, ++rtimercnt);
-      array_needsize (rtimers, rtimermax, rtimercnt, );
-      rtimers [rtimercnt - 1] = w;
-      upheap (rtimers, rtimercnt - 1);
-    }
+  assert (("timer repeat value less than zero not allowed", w->repeat >= 0.));

 
 

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

 }
 
 void
 }
 
 void


@@ -633,24 +672,65 @@ evtimer_stop (struct ev_timer *w)
   if (!ev_is_active (w))
     return;
 
   if (!ev_is_active (w))
     return;
 

-  if (w->is_abs)
+  if (w->active < timercnt--)

     {
     {

-      if (w->active < atimercnt--)
-        {
-          atimers [w->active - 1] = atimers [atimercnt];
-          downheap (atimers, atimercnt, w->active - 1);
-        }
+      timers [w->active - 1] = timers [timercnt];
+      downheap ((WT *)timers, timercnt, w->active - 1);

     }
     }

-  else
+
+  w->at = w->repeat;
+
+  ev_stop ((W)w);
+}
+
+void
+evtimer_again (struct ev_timer *w)
+{
+  if (ev_is_active (w))

     {
     {

-      if (w->active < rtimercnt--)
+      if (w->repeat)

         {
         {

-          rtimers [w->active - 1] = rtimers [rtimercnt];
-          downheap (rtimers, rtimercnt, w->active - 1);
+          w->at = now + w->repeat;
+          downheap ((WT *)timers, timercnt, w->active - 1);

         }
         }

+      else
+        evtimer_stop (w);

     }
     }

+  else if (w->repeat)
+    evtimer_start (w);
+}

 
 

-  ev_stop ((struct ev_watcher *)w);
+void
+evperiodic_start (struct ev_periodic *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  assert (("periodic interval value less than zero not allowed", w->interval >= 0.));
+
+  /* this formula differs from the one in periodic_reify because we do not always round up */
+  if (w->interval)
+    w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
+
+  ev_start ((W)w, ++periodiccnt);
+  array_needsize (periodics, periodicmax, periodiccnt, );
+  periodics [periodiccnt - 1] = w;
+  upheap ((WT *)periodics, periodiccnt - 1);
+}
+
+void
+evperiodic_stop (struct ev_periodic *w)
+{
+  if (!ev_is_active (w))
+    return;
+
+  if (w->active < periodiccnt--)
+    {
+      periodics [w->active - 1] = periodics [periodiccnt];
+      downheap ((WT *)periodics, periodiccnt, w->active - 1);
+    }
+
+  ev_stop ((W)w);

 }
 
 void
 }
 
 void


@@ -659,9 +739,9 @@ 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].head, (struct ev_watcher_list *)w);
+  wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);

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


@@ -679,8 +759,8 @@ 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].head, (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);
 
   if (!signals [w->signum - 1].head)
     signal (w->signum, SIG_DFL);


@@ -691,7 +771,7 @@ void evidle_start (struct ev_idle *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

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

   array_needsize (idles, idlemax, idlecnt, );
   idles [idlecnt - 1] = w;
 }
   array_needsize (idles, idlemax, idlecnt, );
   idles [idlecnt - 1] = w;
 }


@@ -699,7 +779,7 @@ void evidle_start (struct ev_idle *w)
 void evidle_stop (struct ev_idle *w)
 {
   idles [w->active - 1] = idles [--idlecnt];
 void evidle_stop (struct ev_idle *w)
 {
   idles [w->active - 1] = idles [--idlecnt];

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

 }
 
 void evcheck_start (struct ev_check *w)
 }
 
 void evcheck_start (struct ev_check *w)


@@ -707,7 +787,7 @@ void evcheck_start (struct ev_check *w)
   if (ev_is_active (w))
     return;
 
   if (ev_is_active (w))
     return;
 

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

   array_needsize (checks, checkmax, checkcnt, );
   checks [checkcnt - 1] = w;
 }
   array_needsize (checks, checkmax, checkcnt, );
   checks [checkcnt - 1] = w;
 }


@@ -715,11 +795,14 @@ void evcheck_start (struct ev_check *w)
 void evcheck_stop (struct ev_check *w)
 {
   checks [w->active - 1] = checks [--checkcnt];
 void evcheck_stop (struct ev_check *w)
 {
   checks [w->active - 1] = checks [--checkcnt];

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

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

-#if 1
+
+#if 0
+
+struct ev_io wio;

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


@@ -739,23 +822,23 @@ static void
 scb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "signal %x,%d\n", revents, w->signum);
 scb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "signal %x,%d\n", revents, w->signum);

+  evio_stop (&wio);
+  evio_start (&wio);

 }
 
 static void
 gcb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "generic %x\n", revents);
 }
 
 static void
 gcb (struct ev_signal *w, int revents)
 {
   fprintf (stderr, "generic %x\n", revents);

+

 }
 
 int main (void)
 {
 }
 
 int main (void)
 {

-  struct ev_io sin;
-

   ev_init (0);
 
   ev_init (0);
 

-  evw_init (&sin, sin_cb, 55);
-  evio_set (&sin, 0, EV_READ);
-  evio_start (&sin);
+  evio_init (&wio, sin_cb, 0, EV_READ);
+  evio_start (&wio);

 
   struct ev_timer t[10000];
 
 
   struct ev_timer t[10000];
 


@@ -765,7 +848,7 @@ int main (void)
     {
       struct ev_timer *w = t + i;
       evw_init (w, ocb, i);
     {
       struct ev_timer *w = t + i;
       evw_init (w, ocb, i);

-      evtimer_set_abs (w, drand48 (), 0.99775533);
+      evtimer_init_abs (w, ocb, drand48 (), 0.99775533);

       evtimer_start (w);
       if (drand48 () < 0.5)
         evtimer_stop (w);
       evtimer_start (w);
       if (drand48 () < 0.5)
         evtimer_stop (w);


@@ -773,21 +856,19 @@ int main (void)
 #endif
 
   struct ev_timer t1;
 #endif
 
   struct ev_timer t1;

-  evw_init (&t1, ocb, 0);
-  evtimer_set_abs (&t1, 5, 10);
+  evtimer_init (&t1, ocb, 5, 10);

   evtimer_start (&t1);
 
   struct ev_signal sig;
   evtimer_start (&t1);
 
   struct ev_signal sig;

-  evw_init (&sig, scb, 65535);
-  evsignal_set (&sig, SIGQUIT);
+  evsignal_init (&sig, scb, SIGQUIT);

   evsignal_start (&sig);
 
   struct ev_check cw;
   evsignal_start (&sig);
 
   struct ev_check cw;

-  evw_init (&cw, gcb, 0);
+  evcheck_init (&cw, gcb);

   evcheck_start (&cw);
 
   struct ev_idle iw;
   evcheck_start (&cw);
 
   struct ev_idle iw;

-  evw_init (&iw, gcb, 0);
+  evidle_init (&iw, gcb);

   evidle_start (&iw);
 
   ev_loop (0);
   evidle_start (&iw);
 
   ev_loop (0);