the big rename

[software/libev.git] / ev.c

diff --git a/ev.c b/ev.c
index ffd19c66d08269742f0b3594ee9cf89230e8329a..0ab2670a6c540dee5a71b772d8f06e37a0283f33 100644 (file)
--- a/ev.c
+++ b/ev.c
@@ -38,6 +38,8 @@
 
 #include <assert.h>
 #include <errno.h>
 
 #include <assert.h>
 #include <errno.h>

+#include <sys/types.h>
+#include <sys/wait.h>

 #include <sys/time.h>
 #include <time.h>
 
 #include <sys/time.h>
 #include <time.h>
 


@@ -61,6 +63,7 @@
 
 #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.

+#define PID_HASHSIZE  16 /* size of pid hahs table, must be power of two */

 
 #include "ev.h"
 
 
 #include "ev.h"
 


@@ -112,7 +115,13 @@ get_clock (void)
 #define array_needsize(base,cur,cnt,init)              \
   if ((cnt) > cur)                                     \
     {                                                  \
 #define array_needsize(base,cur,cnt,init)              \
   if ((cnt) > cur)                                     \
     {                                                  \

-      int newcnt = cur ? cur << 1 : 16;                        \
+      int newcnt = cur;                                        \
+      do                                               \
+        {                                              \
+          newcnt = (newcnt << 1) | 4 & ~3;             \
+        }                                              \
+      while ((cnt) > 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;                                    \


@@ -123,22 +132,19 @@ get_clock (void)
 typedef struct
 {
   struct ev_io *head;
 typedef struct
 {
   struct ev_io *head;

-  unsigned char wev, rev; /* want, received event set */
+  int events;

 } ANFD;
 
 static ANFD *anfds;
 static int anfdmax;
 
 } ANFD;
 
 static ANFD *anfds;
 static int anfdmax;
 

-static int *fdchanges;
-static int fdchangemax, fdchangecnt;
-

 static void
 anfds_init (ANFD *base, int count)
 {
   while (count--)
     {
 static void
 anfds_init (ANFD *base, int count)
 {
   while (count--)
     {

-      base->head = 0;
-      base->wev = base->rev = EV_NONE;
+      base->head   = 0;
+      base->events = EV_NONE;

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


@@ -164,6 +170,15 @@ event (W w, int events)
     }
 }
 
     }
 }
 

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

 static void
 fd_event (int fd, int events)
 {
 static void
 fd_event (int fd, int events)
 {


@@ -179,26 +194,66 @@ fd_event (int fd, int events)
     }
 }
 
     }
 }
 

+/*****************************************************************************/
+
+static int *fdchanges;
+static int fdchangemax, fdchangecnt;
+

 static void
 static void

-queue_events (W *events, int eventcnt, int type)
+fd_reify (void)

 {
   int i;
 
 {
   int i;
 

-  for (i = 0; i < eventcnt; ++i)
-    event (events [i], type);
+  for (i = 0; i < fdchangecnt; ++i)
+    {
+      int fd = fdchanges [i];
+      ANFD *anfd = anfds + fd;
+      struct ev_io *w;
+
+      int events = 0;
+
+      for (w = anfd->head; w; w = w->next)
+        events |= w->events;
+
+      anfd->events &= ~EV_REIFY;
+
+      if (anfd->events != events)
+        {
+          method_modify (fd, anfd->events, events);
+          anfd->events = events;
+        }
+    }
+
+  fdchangecnt = 0;
+}
+
+static void
+fd_change (int fd)
+{
+  if (anfds [fd].events & EV_REIFY)
+    return;
+
+  anfds [fd].events |= EV_REIFY;
+
+  ++fdchangecnt;
+  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
+  fdchanges [fdchangecnt - 1] = fd;

 }
 
 /* called on EBADF to verify fds */
 static void
 }
 
 /* called on EBADF to verify fds */
 static void

-fd_recheck ()
+fd_recheck (void)

 {
   int fd;
 
   for (fd = 0; fd < anfdmax; ++fd)
 {
   int fd;
 
   for (fd = 0; fd < anfdmax; ++fd)

-    if (anfds [fd].wev)
+    if (anfds [fd].events)

       if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
         while (anfds [fd].head)
       if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
         while (anfds [fd].head)

-          evio_stop (anfds [fd].head);
+          {
+            event ((W)anfds [fd].head, EV_ERROR);
+            ev_io_stop (anfds [fd].head);
+          }

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


@@ -317,8 +372,8 @@ siginit (void)
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
 
   fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
   fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
 

-  evio_set (&sigev, sigpipe [0], EV_READ);
-  evio_start (&sigev);
+  ev_io_set (&sigev, sigpipe [0], EV_READ);
+  ev_io_start (&sigev);

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


@@ -334,6 +389,30 @@ static int checkmax, checkcnt;
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

+static struct ev_child *childs [PID_HASHSIZE];
+static struct ev_signal childev;
+
+#ifndef WCONTINUED
+# define WCONTINUED 0
+#endif
+
+static void
+childcb (struct ev_signal *sw, int revents)
+{
+  struct ev_child *w;
+  int pid, status;
+
+  while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
+    for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
+      if (w->pid == pid || w->pid == -1)
+        {
+          w->status = status;
+          event ((W)w, EV_CHILD);
+        }
+}
+
+/*****************************************************************************/
+

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


@@ -341,35 +420,53 @@ static int checkmax, checkcnt;
 # include "ev_select.c"
 #endif
 
 # include "ev_select.c"
 #endif
 

+int
+ev_version_major (void)
+{
+  return EV_VERSION_MAJOR;
+}
+
+int
+ev_version_minor (void)
+{
+  return EV_VERSION_MINOR;
+}
+

 int ev_init (int flags)
 {
 int ev_init (int flags)
 {

+  if (!ev_method)
+    {

 #if HAVE_MONOTONIC
 #if HAVE_MONOTONIC

-  {
-    struct timespec ts;
-    if (!clock_gettime (CLOCK_MONOTONIC, &ts))
-      have_monotonic = 1;
-  }
+      {
+        struct timespec ts;
+        if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+          have_monotonic = 1;
+      }

 #endif
 
 #endif
 

-  ev_now = ev_time ();
-  now    = get_clock ();
-  diff   = ev_now - now;
+      ev_now = ev_time ();
+      now    = get_clock ();
+      diff   = ev_now - now;

 
 

-  if (pipe (sigpipe))
-    return 0;
+      if (pipe (sigpipe))
+        return 0;

 
 

-  ev_method = EVMETHOD_NONE;
+      ev_method = EVMETHOD_NONE;

 #if HAVE_EPOLL
 #if HAVE_EPOLL

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

 #endif
 #if HAVE_SELECT
 #endif
 #if HAVE_SELECT

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

 #endif
 
 #endif
 

-  if (ev_method)
-    {
-      evw_init (&sigev, sigcb);
-      siginit ();
+      if (ev_method)
+        {
+          ev_watcher_init (&sigev, sigcb);
+          siginit ();
+
+          ev_signal_init (&childev, childcb, SIGCHLD);
+          ev_signal_start (&childev);
+        }

     }
 
   return ev_method;
     }
 
   return ev_method;


@@ -377,24 +474,27 @@ int ev_init (int flags)
 
 /*****************************************************************************/
 
 
 /*****************************************************************************/
 

-void ev_prefork (void)
+void
+ev_prefork (void)

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

-void ev_postfork_parent (void)
+void
+ev_postfork_parent (void)

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

-void ev_postfork_child (void)
+void
+ev_postfork_child (void)

 {
 #if HAVE_EPOLL
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif
 
 {
 #if HAVE_EPOLL
   if (ev_method == EVMETHOD_EPOLL)
     epoll_postfork_child ();
 #endif
 

-  evio_stop (&sigev);
+  ev_io_stop (&sigev);

   close (sigpipe [0]);
   close (sigpipe [1]);
   pipe (sigpipe);
   close (sigpipe [0]);
   close (sigpipe [1]);
   pipe (sigpipe);


@@ -404,33 +504,7 @@ void ev_postfork_child (void)
 /*****************************************************************************/
 
 static void
 /*****************************************************************************/
 
 static void

-fd_reify (void)
-{
-  int i;
-
-  for (i = 0; i < fdchangecnt; ++i)
-    {
-      int fd = fdchanges [i];
-      ANFD *anfd = anfds + fd;
-      struct ev_io *w;
-
-      int wev = 0;
-
-      for (w = anfd->head; w; w = w->next)
-        wev |= w->events;
-
-      if (anfd->wev != wev)
-        {
-          method_modify (fd, anfd->wev, wev);
-          anfd->wev = wev;
-        }
-    }
-
-  fdchangecnt = 0;
-}
-
-static void
-call_pending ()
+call_pending (void)

 {
   while (pendingcnt)
     {
 {
   while (pendingcnt)
     {


@@ -445,7 +519,7 @@ call_pending ()
 }
 
 static void
 }
 
 static void

-timers_reify ()
+timers_reify (void)

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


@@ -461,12 +535,12 @@ timers_reify ()
           downheap ((WT *)timers, timercnt, 0);
         }
       else
           downheap ((WT *)timers, timercnt, 0);
         }
       else

-        evtimer_stop (w); /* nonrepeating: stop timer */
+        ev_timer_stop (w); /* nonrepeating: stop timer */

     }
 }
 
 static void
     }
 }
 
 static void

-periodics_reify ()
+periodics_reify (void)

 {
   while (periodiccnt && periodics [0]->at <= ev_now)
     {
 {
   while (periodiccnt && periodics [0]->at <= ev_now)
     {


@@ -480,7 +554,7 @@ periodics_reify ()
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else
           downheap ((WT *)periodics, periodiccnt, 0);
         }
       else

-        evperiodic_stop (w); /* nonrepeating: stop timer */
+        ev_periodic_stop (w); /* nonrepeating: stop timer */

 
       event ((W)w, EV_TIMEOUT);
     }
 
       event ((W)w, EV_TIMEOUT);
     }


@@ -502,8 +576,8 @@ periodics_reschedule (ev_tstamp diff)
 
           if (fabs (diff) >= 1e-4)
             {
 
           if (fabs (diff) >= 1e-4)
             {

-              evperiodic_stop (w);
-              evperiodic_start (w);
+              ev_periodic_stop (w);
+              ev_periodic_start (w);

 
               i = 0; /* restart loop, inefficient, but time jumps should be rare */
             }
 
               i = 0; /* restart loop, inefficient, but time jumps should be rare */
             }


@@ -512,7 +586,7 @@ periodics_reschedule (ev_tstamp diff)
 }
 
 static void
 }
 
 static void

-time_update ()
+time_update (void)

 {
   int i;
 
 {
   int i;
 


@@ -556,7 +630,7 @@ int ev_loop_done;
 void ev_loop (int flags)
 {
   double block;
 void ev_loop (int flags)
 {
   double block;

-  ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
+  ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;

 
   do
     {
 
   do
     {


@@ -671,7 +745,7 @@ ev_stop (W w)
 /*****************************************************************************/
 
 void
 /*****************************************************************************/
 
 void

-evio_start (struct ev_io *w)
+ev_io_start (struct ev_io *w)

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


@@ -682,13 +756,11 @@ evio_start (struct ev_io *w)
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 
   array_needsize (anfds, anfdmax, fd + 1, anfds_init);
   wlist_add ((WL *)&anfds[fd].head, (WL)w);
 

-  ++fdchangecnt;
-  array_needsize (fdchanges, fdchangemax, fdchangecnt, );
-  fdchanges [fdchangecnt - 1] = fd;
+  fd_change (fd);

 }
 
 void
 }
 
 void

-evio_stop (struct ev_io *w)
+ev_io_stop (struct ev_io *w)

 {
   ev_clear ((W)w);
   if (!ev_is_active (w))
 {
   ev_clear ((W)w);
   if (!ev_is_active (w))


@@ -697,13 +769,11 @@ evio_stop (struct ev_io *w)
   wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
   ev_stop ((W)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;
+  fd_change (w->fd);

 }
 
 void
 }
 
 void

-evtimer_start (struct ev_timer *w)
+ev_timer_start (struct ev_timer *w)

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


@@ -719,7 +789,7 @@ evtimer_start (struct ev_timer *w)
 }
 
 void
 }
 
 void

-evtimer_stop (struct ev_timer *w)
+ev_timer_stop (struct ev_timer *w)

 {
   ev_clear ((W)w);
   if (!ev_is_active (w))
 {
   ev_clear ((W)w);
   if (!ev_is_active (w))


@@ -737,7 +807,7 @@ evtimer_stop (struct ev_timer *w)
 }
 
 void
 }
 
 void

-evtimer_again (struct ev_timer *w)
+ev_timer_again (struct ev_timer *w)

 {
   if (ev_is_active (w))
     {
 {
   if (ev_is_active (w))
     {


@@ -747,14 +817,14 @@ evtimer_again (struct ev_timer *w)
           downheap ((WT *)timers, timercnt, w->active - 1);
         }
       else
           downheap ((WT *)timers, timercnt, w->active - 1);
         }
       else

-        evtimer_stop (w);
+        ev_timer_stop (w);

     }
   else if (w->repeat)
     }
   else if (w->repeat)

-    evtimer_start (w);
+    ev_timer_start (w);

 }
 
 void
 }
 
 void

-evperiodic_start (struct ev_periodic *w)
+ev_periodic_start (struct ev_periodic *w)

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


@@ -772,7 +842,7 @@ evperiodic_start (struct ev_periodic *w)
 }
 
 void
 }
 
 void

-evperiodic_stop (struct ev_periodic *w)
+ev_periodic_stop (struct ev_periodic *w)

 {
   ev_clear ((W)w);
   if (!ev_is_active (w))
 {
   ev_clear ((W)w);
   if (!ev_is_active (w))


@@ -788,7 +858,7 @@ evperiodic_stop (struct ev_periodic *w)
 }
 
 void
 }
 
 void

-evsignal_start (struct ev_signal *w)
+ev_signal_start (struct ev_signal *w)

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


@@ -808,7 +878,7 @@ evsignal_start (struct ev_signal *w)
 }
 
 void
 }
 
 void

-evsignal_stop (struct ev_signal *w)
+ev_signal_stop (struct ev_signal *w)

 {
   ev_clear ((W)w);
   if (!ev_is_active (w))
 {
   ev_clear ((W)w);
   if (!ev_is_active (w))


@@ -821,7 +891,8 @@ evsignal_stop (struct ev_signal *w)
     signal (w->signum, SIG_DFL);
 }
 
     signal (w->signum, SIG_DFL);
 }
 

-void evidle_start (struct ev_idle *w)
+void
+ev_idle_start (struct ev_idle *w)

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


@@ -831,7 +902,8 @@ void evidle_start (struct ev_idle *w)
   idles [idlecnt - 1] = w;
 }
 
   idles [idlecnt - 1] = w;
 }
 

-void evidle_stop (struct ev_idle *w)
+void
+ev_idle_stop (struct ev_idle *w)

 {
   ev_clear ((W)w);
   if (ev_is_active (w))
 {
   ev_clear ((W)w);
   if (ev_is_active (w))


@@ -841,7 +913,8 @@ void evidle_stop (struct ev_idle *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

-void evprepare_start (struct ev_prepare *w)
+void
+ev_prepare_start (struct ev_prepare *w)

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


@@ -851,7 +924,8 @@ void evprepare_start (struct ev_prepare *w)
   prepares [preparecnt - 1] = w;
 }
 
   prepares [preparecnt - 1] = w;
 }
 

-void evprepare_stop (struct ev_prepare *w)
+void
+ev_prepare_stop (struct ev_prepare *w)

 {
   ev_clear ((W)w);
   if (ev_is_active (w))
 {
   ev_clear ((W)w);
   if (ev_is_active (w))


@@ -861,7 +935,8 @@ void evprepare_stop (struct ev_prepare *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

-void evcheck_start (struct ev_check *w)
+void
+ev_check_start (struct ev_check *w)

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


@@ -871,7 +946,8 @@ void evcheck_start (struct ev_check *w)
   checks [checkcnt - 1] = w;
 }
 
   checks [checkcnt - 1] = w;
 }
 

-void evcheck_stop (struct ev_check *w)
+void
+ev_check_stop (struct ev_check *w)

 {
   ev_clear ((W)w);
   if (ev_is_active (w))
 {
   ev_clear ((W)w);
   if (ev_is_active (w))


@@ -881,6 +957,27 @@ void evcheck_stop (struct ev_check *w)
   ev_stop ((W)w);
 }
 
   ev_stop ((W)w);
 }
 

+void
+ev_child_start (struct ev_child *w)
+{
+  if (ev_is_active (w))
+    return;
+
+  ev_start ((W)w, 1);
+  wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+}
+
+void
+ev_child_stop (struct ev_child *w)
+{
+  ev_clear ((W)w);
+  if (ev_is_active (w))
+    return;
+
+  wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
+  ev_stop ((W)w);
+}
+

 /*****************************************************************************/
 
 struct ev_once
 /*****************************************************************************/
 
 struct ev_once


@@ -897,8 +994,8 @@ once_cb (struct ev_once *once, int revents)
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
 
   void (*cb)(int revents, void *arg) = once->cb;
   void *arg = once->arg;
 

-  evio_stop (&once->io);
-  evtimer_stop (&once->to);
+  ev_io_stop (&once->io);
+  ev_timer_stop (&once->to);

   free (once);
 
   cb (revents, arg);
   free (once);
 
   cb (revents, arg);


@@ -928,20 +1025,20 @@ ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *ar
       once->cb  = cb;
       once->arg = arg;
 
       once->cb  = cb;
       once->arg = arg;
 

-      evw_init (&once->io, once_cb_io);
+      ev_watcher_init (&once->io, once_cb_io);

 
       if (fd >= 0)
         {
 
       if (fd >= 0)
         {

-          evio_set (&once->io, fd, events);
-          evio_start (&once->io);
+          ev_io_set (&once->io, fd, events);
+          ev_io_start (&once->io);

         }
 
         }
 

-      evw_init (&once->to, once_cb_to);
+      ev_watcher_init (&once->to, once_cb_to);

 
       if (timeout >= 0.)
         {
 
       if (timeout >= 0.)
         {

-          evtimer_set (&once->to, timeout, 0.);
-          evtimer_start (&once->to);
+          ev_timer_set (&once->to, timeout, 0.);
+          ev_timer_start (&once->to);

         }
     }
 }
         }
     }
 }


@@ -962,16 +1059,16 @@ static void
 ocb (struct ev_timer *w, int revents)
 {
   //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
 ocb (struct ev_timer *w, int revents)
 {
   //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);

-  evtimer_stop (w);
-  evtimer_start (w);
+  ev_timer_stop (w);
+  ev_timer_start (w);

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

-  evio_stop (&wio);
-  evio_start (&wio);
+  ev_io_stop (&wio);
+  ev_io_start (&wio);

 }
 
 static void
 }
 
 static void


@@ -985,8 +1082,8 @@ int main (void)
 {
   ev_init (0);
 
 {
   ev_init (0);
 

-  evio_init (&wio, sin_cb, 0, EV_READ);
-  evio_start (&wio);
+  ev_io_init (&wio, sin_cb, 0, EV_READ);
+  ev_io_start (&wio);

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


@@ -995,29 +1092,29 @@ int main (void)
   for (i = 0; i < 10000; ++i)
     {
       struct ev_timer *w = t + i;
   for (i = 0; i < 10000; ++i)
     {
       struct ev_timer *w = t + i;

-      evw_init (w, ocb, i);
-      evtimer_init_abs (w, ocb, drand48 (), 0.99775533);
-      evtimer_start (w);
+      ev_watcher_init (w, ocb, i);
+      ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
+      ev_timer_start (w);

       if (drand48 () < 0.5)
       if (drand48 () < 0.5)

-        evtimer_stop (w);
+        ev_timer_stop (w);

     }
 #endif
 
   struct ev_timer t1;
     }
 #endif
 
   struct ev_timer t1;

-  evtimer_init (&t1, ocb, 5, 10);
-  evtimer_start (&t1);
+  ev_timer_init (&t1, ocb, 5, 10);
+  ev_timer_start (&t1);

 
   struct ev_signal sig;
 
   struct ev_signal sig;

-  evsignal_init (&sig, scb, SIGQUIT);
-  evsignal_start (&sig);
+  ev_signal_init (&sig, scb, SIGQUIT);
+  ev_signal_start (&sig);

 
   struct ev_check cw;
 
   struct ev_check cw;

-  evcheck_init (&cw, gcb);
-  evcheck_start (&cw);
+  ev_check_init (&cw, gcb);
+  ev_check_start (&cw);

 
   struct ev_idle iw;
 
   struct ev_idle iw;

-  evidle_init (&iw, gcb);
-  evidle_start (&iw);
+  ev_idle_init (&iw, gcb);
+  ev_idle_start (&iw);

 
   ev_loop (0);
 
 
   ev_loop (0);