+/*
+ * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#if EV_USE_CONFIG_H
+# include "config.h"
+#endif
+
#include <math.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
+#include <stddef.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/time.h>
#include <time.h>
-#define HAVE_EPOLL 1
-
-#ifndef HAVE_MONOTONIC
+#ifndef EV_USE_MONOTONIC
# ifdef CLOCK_MONOTONIC
-# define HAVE_MONOTONIC 1
+# define EV_USE_MONOTONIC 1
# endif
#endif
-#ifndef HAVE_SELECT
-# define HAVE_SELECT 1
+#ifndef EV_USE_SELECT
+# define EV_USE_SELECT 1
#endif
-#ifndef HAVE_EPOLL
-# define HAVE_EPOLL 0
+#ifndef EV_USE_EPOLL
+# define EV_USE_EPOLL 0
#endif
-#ifndef HAVE_REALTIME
-# define HAVE_REALTIME 1 /* posix requirement, but might be slower */
+#ifndef CLOCK_REALTIME
+# define EV_USE_REALTIME 0
+#endif
+#ifndef EV_USE_REALTIME
+# define EV_USE_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.
+#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */
+#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
+#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
#include "ev.h"
ev_tstamp
ev_time (void)
{
-#if HAVE_REALTIME
+#if EV_USE_REALTIME
struct timespec ts;
clock_gettime (CLOCK_REALTIME, &ts);
return ts.tv_sec + ts.tv_nsec * 1e-9;
static ev_tstamp
get_clock (void)
{
-#if HAVE_MONOTONIC
+#if EV_USE_MONOTONIC
if (have_monotonic)
{
struct timespec ts;
return ev_time ();
}
+#define array_roundsize(base,n) ((n) | 4 & ~3)
+
#define array_needsize(base,cur,cnt,init) \
if ((cnt) > cur) \
{ \
- int newcnt = cur ? cur << 1 : 16; \
- fprintf (stderr, "resize(" # base ") from %d to %d\n", cur, newcnt);\
+ int newcnt = cur; \
+ do \
+ { \
+ newcnt = array_roundsize (base, newcnt << 1); \
+ } \
+ while ((cnt) > newcnt); \
+ \
base = realloc (base, sizeof (*base) * (newcnt)); \
init (base + cur, newcnt - cur); \
cur = newcnt; \
typedef struct
{
struct ev_io *head;
- unsigned char wev, rev; /* want, received event set */
+ unsigned char events;
+ unsigned char reify;
} ANFD;
static ANFD *anfds;
static int anfdmax;
-static int *fdchanges;
-static int fdchangemax, fdchangecnt;
-
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->reify = 0;
+
++base;
}
}
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;
pendings [pendingcnt - 1].events = 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 int *fdchanges;
+static int fdchangemax, fdchangecnt;
+
static void
-queue_events (W *events, int eventcnt, int type)
+fd_reify (void)
{
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->reify = 0;
+
+ if (anfd->events != events)
+ {
+ method_modify (fd, anfd->events, events);
+ anfd->events = events;
+ }
+ }
+
+ fdchangecnt = 0;
+}
+
+static void
+fd_change (int fd)
+{
+ if (anfds [fd].reify || fdchangecnt < 0)
+ return;
+
+ anfds [fd].reify = 1;
+
+ ++fdchangecnt;
+ array_needsize (fdchanges, fdchangemax, fdchangecnt, );
+ fdchanges [fdchangecnt - 1] = fd;
+}
+
+/* called on EBADF to verify fds */
+static void
+fd_recheck (void)
+{
+ int fd;
+
+ for (fd = 0; fd < anfdmax; ++fd)
+ if (anfds [fd].events)
+ if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
+ while (anfds [fd].head)
+ {
+ ev_io_stop (anfds [fd].head);
+ event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE);
+ }
}
/*****************************************************************************/
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];
-static sig_atomic_t gotsig;
+static sig_atomic_t volatile gotsig;
static struct ev_io sigev;
static void
{
base->head = 0;
base->gotsig = 0;
+
++base;
}
}
if (!gotsig)
{
gotsig = 1;
- write (sigpipe [1], &gotsig, 1);
+ write (sigpipe [1], &signum, 1);
}
}
struct ev_signal *w;
int sig;
- gotsig = 0;
read (sigpipe [0], &revents, 1);
+ gotsig = 0;
for (sig = signalmax; sig--; )
if (signals [sig].gotsig)
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);
}
/*****************************************************************************/
static struct ev_idle **idles;
static int idlemax, idlecnt;
+static struct ev_prepare **prepares;
+static int preparemax, preparecnt;
+
static struct ev_check **checks;
static int checkmax, checkcnt;
/*****************************************************************************/
-#if HAVE_EPOLL
+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 EV_USE_EPOLL
# include "ev_epoll.c"
#endif
-#if HAVE_SELECT
+#if EV_USE_SELECT
# 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)
{
-#if HAVE_MONOTONIC
- {
- struct timespec ts;
- if (!clock_gettime (CLOCK_MONOTONIC, &ts))
- have_monotonic = 1;
- }
+ if (!ev_method)
+ {
+#if EV_USE_MONOTONIC
+ {
+ struct timespec ts;
+ if (!clock_gettime (CLOCK_MONOTONIC, &ts))
+ have_monotonic = 1;
+ }
#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;
-#if HAVE_EPOLL
- if (ev_method == EVMETHOD_NONE) epoll_init (flags);
+ ev_method = EVMETHOD_NONE;
+#if EV_USE_EPOLL
+ if (ev_method == EVMETHOD_NONE) epoll_init (flags);
#endif
-#if HAVE_SELECT
- if (ev_method == EVMETHOD_NONE) select_init (flags);
+#if EV_USE_SELECT
+ if (ev_method == EVMETHOD_NONE) select_init (flags);
#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;
/*****************************************************************************/
-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)
{
-#if HAVE_EPOLL
+#if EV_USE_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);
/*****************************************************************************/
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)
{
- int i;
-
- for (i = 0; i < pendingcnt; ++i)
+ while (pendingcnt)
{
- ANPENDING *p = pendings + i;
+ ANPENDING *p = pendings + --pendingcnt;
if (p->w)
{
p->w->cb (p->w, p->events);
}
}
-
- pendingcnt = 0;
}
static void
-timers_reify ()
+timers_reify (void)
{
while (timercnt && timers [0]->at <= now)
{
/* 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;
- assert (("timer timeout in the past, negative repeat?", w->at > now));
downheap ((WT *)timers, timercnt, 0);
}
else
- evtimer_stop (w); /* nonrepeating: stop timer */
+ ev_timer_stop (w); /* nonrepeating: stop timer */
event ((W)w, EV_TIMEOUT);
}
}
static void
-periodics_reify ()
+periodics_reify (void)
{
while (periodiccnt && periodics [0]->at <= ev_now)
{
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
- evperiodic_stop (w); /* nonrepeating: stop timer */
+ ev_periodic_stop (w); /* nonrepeating: stop timer */
- event ((W)w, EV_TIMEOUT);
+ event ((W)w, EV_PERIODIC);
}
}
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 */
}
}
static void
-time_update ()
+time_update (void)
{
int i;
void ev_loop (int flags)
{
double block;
- ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0;
-
- if (checkcnt)
- {
- queue_events ((W *)checks, checkcnt, EV_CHECK);
- call_pending ();
- }
+ ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
do
{
+ /* queue check watchers (and execute them) */
+ if (preparecnt)
+ {
+ queue_events ((W *)prepares, preparecnt, EV_PREPARE);
+ call_pending ();
+ }
+
/* update fd-related kernel structures */
fd_reify ();
/* calculate blocking time */
- /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */
+ /* we only need this for !monotonic clockor timers, but as we basically
+ always have timers, we just calculate it always */
ev_now = ev_time ();
if (flags & EVLOOP_NONBLOCK || idlecnt)
if (timercnt)
{
- ev_tstamp to = timers [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;
}
time_update ();
/* queue pending timers and reschedule them */
- periodics_reify (); /* absolute timers first */
- timers_reify (); /* relative timers second */
+ timers_reify (); /* relative timers called last */
+ periodics_reify (); /* absolute timers called first */
/* queue idle watchers unless io or timers are pending */
if (!pendingcnt)
queue_events ((W *)idles, idlecnt, EV_IDLE);
- /* queue check and possibly idle watchers */
- queue_events ((W *)checks, checkcnt, EV_CHECK);
+ /* queue check watchers, to be executed first */
+ if (checkcnt)
+ queue_events ((W *)checks, checkcnt, EV_CHECK);
call_pending ();
}
}
}
+static void
+ev_clear_pending (W w)
+{
+ if (w->pending)
+ {
+ pendings [w->pending - 1].w = 0;
+ w->pending = 0;
+ }
+}
+
static void
ev_start (W w, int active)
{
- w->pending = 0;
w->active = active;
}
static void
ev_stop (W w)
{
- if (w->pending)
- pendings [w->pending - 1].w = 0;
-
w->active = 0;
}
/*****************************************************************************/
void
-evio_start (struct ev_io *w)
+ev_io_start (struct ev_io *w)
{
if (ev_is_active (w))
return;
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);
- ++fdchangecnt;
- array_needsize (fdchanges, fdchangemax, fdchangecnt, );
- fdchanges [fdchangecnt - 1] = fd;
+ fd_change (fd);
}
void
-evio_stop (struct ev_io *w)
+ev_io_stop (struct ev_io *w)
{
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
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
-evtimer_start (struct ev_timer *w)
+ev_timer_start (struct ev_timer *w)
{
if (ev_is_active (w))
return;
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, );
}
void
-evtimer_stop (struct ev_timer *w)
+ev_timer_stop (struct ev_timer *w)
{
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
downheap ((WT *)timers, timercnt, w->active - 1);
}
+ w->at = w->repeat;
+
ev_stop ((W)w);
}
void
-evperiodic_start (struct ev_periodic *w)
+ev_timer_again (struct ev_timer *w)
+{
+ if (ev_is_active (w))
+ {
+ if (w->repeat)
+ {
+ w->at = now + w->repeat;
+ downheap ((WT *)timers, timercnt, w->active - 1);
+ }
+ else
+ ev_timer_stop (w);
+ }
+ else if (w->repeat)
+ ev_timer_start (w);
+}
+
+void
+ev_periodic_start (struct ev_periodic *w)
{
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)
}
void
-evperiodic_stop (struct ev_periodic *w)
+ev_periodic_stop (struct ev_periodic *w)
{
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
}
void
-evsignal_start (struct ev_signal *w)
+ev_signal_start (struct ev_signal *w)
{
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);
}
void
-evsignal_stop (struct ev_signal *w)
+ev_signal_stop (struct ev_signal *w)
{
+ ev_clear_pending ((W)w);
if (!ev_is_active (w))
return;
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;
idles [idlecnt - 1] = w;
}
-void evidle_stop (struct ev_idle *w)
+void
+ev_idle_stop (struct ev_idle *w)
{
+ ev_clear_pending ((W)w);
+ if (ev_is_active (w))
+ return;
+
idles [w->active - 1] = idles [--idlecnt];
ev_stop ((W)w);
}
-void evcheck_start (struct ev_check *w)
+void
+ev_prepare_start (struct ev_prepare *w)
+{
+ if (ev_is_active (w))
+ return;
+
+ ev_start ((W)w, ++preparecnt);
+ array_needsize (prepares, preparemax, preparecnt, );
+ prepares [preparecnt - 1] = w;
+}
+
+void
+ev_prepare_stop (struct ev_prepare *w)
+{
+ ev_clear_pending ((W)w);
+ if (ev_is_active (w))
+ return;
+
+ prepares [w->active - 1] = prepares [--preparecnt];
+ ev_stop ((W)w);
+}
+
+void
+ev_check_start (struct ev_check *w)
{
if (ev_is_active (w))
return;
checks [checkcnt - 1] = w;
}
-void evcheck_stop (struct ev_check *w)
+void
+ev_check_stop (struct ev_check *w)
{
+ ev_clear_pending ((W)w);
+ if (ev_is_active (w))
+ return;
+
checks [w->active - 1] = checks [--checkcnt];
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_pending ((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_io io;
+ struct ev_timer to;
+ void (*cb)(int revents, void *arg);
+ void *arg;
+};
+
+static void
+once_cb (struct ev_once *once, int revents)
+{
+ void (*cb)(int revents, void *arg) = once->cb;
+ void *arg = once->arg;
+
+ ev_io_stop (&once->io);
+ ev_timer_stop (&once->to);
+ free (once);
+
+ cb (revents, arg);
+}
+
+static void
+once_cb_io (struct ev_io *w, int revents)
+{
+ once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
+}
+
+static void
+once_cb_to (struct ev_timer *w, int revents)
+{
+ once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
+}
+
+void
+ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
+{
+ struct ev_once *once = malloc (sizeof (struct ev_once));
+
+ if (!once)
+ cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
+ else
+ {
+ once->cb = cb;
+ once->arg = arg;
+
+ ev_watcher_init (&once->io, once_cb_io);
+ if (fd >= 0)
+ {
+ ev_io_set (&once->io, fd, events);
+ ev_io_start (&once->io);
+ }
+
+ ev_watcher_init (&once->to, once_cb_to);
+ if (timeout >= 0.)
+ {
+ ev_timer_set (&once->to, timeout, 0.);
+ ev_timer_start (&once->to);
+ }
+ }
+}
+
/*****************************************************************************/
#if 0
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);
- evio_stop (&wio);
- evio_start (&wio);
+ ev_io_stop (&wio);
+ ev_io_start (&wio);
}
static void
{
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];
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)
- evtimer_stop (w);
+ ev_timer_stop (w);
}
#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;
- evsignal_init (&sig, scb, SIGQUIT);
- evsignal_start (&sig);
+ ev_signal_init (&sig, scb, SIGQUIT);
+ ev_signal_start (&sig);
struct ev_check cw;
- evcheck_init (&cw, gcb);
- evcheck_start (&cw);
+ ev_check_init (&cw, gcb);
+ ev_check_start (&cw);
struct ev_idle iw;
- evidle_init (&iw, gcb);
- evidle_start (&iw);
+ ev_idle_init (&iw, gcb);
+ ev_idle_start (&iw);
ev_loop (0);