typedef struct
{
struct ev_io *head;
- unsigned char wev, rev; /* want, received event set */
+ int events;
} 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;
}
}
}
}
+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->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
-fd_recheck ()
+fd_recheck (void)
{
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)
- evio_stop (anfds [fd].head);
+ {
+ event ((W)anfds [fd].head, EV_ERROR);
+ ev_io_stop (anfds [fd].head);
+ }
}
/*****************************************************************************/
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);
}
/*****************************************************************************/
# 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 (!ev_method)
if (ev_method)
{
- evw_init (&sigev, sigcb);
+ ev_watcher_init (&sigev, sigcb);
siginit ();
- evsignal_init (&childev, childcb, SIGCHLD);
- evsignal_start (&childev);
+ ev_signal_init (&childev, childcb, SIGCHLD);
+ ev_signal_start (&childev);
}
}
/*****************************************************************************/
-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_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)
{
while (pendingcnt)
{
}
static void
-timers_reify ()
+timers_reify (void)
{
while (timercnt && timers [0]->at <= now)
{
downheap ((WT *)timers, timercnt, 0);
}
else
- evtimer_stop (w); /* nonrepeating: stop timer */
+ ev_timer_stop (w); /* nonrepeating: stop timer */
}
}
static void
-periodics_reify ()
+periodics_reify (void)
{
while (periodiccnt && periodics [0]->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);
}
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;
+ ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
do
{
/*****************************************************************************/
void
-evio_start (struct ev_io *w)
+ev_io_start (struct ev_io *w)
{
if (ev_is_active (w))
return;
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 ((W)w);
if (!ev_is_active (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
-evtimer_start (struct ev_timer *w)
+ev_timer_start (struct ev_timer *w)
{
if (ev_is_active (w))
return;
}
void
-evtimer_stop (struct ev_timer *w)
+ev_timer_stop (struct ev_timer *w)
{
ev_clear ((W)w);
if (!ev_is_active (w))
}
void
-evtimer_again (struct ev_timer *w)
+ev_timer_again (struct ev_timer *w)
{
if (ev_is_active (w))
{
downheap ((WT *)timers, timercnt, w->active - 1);
}
else
- evtimer_stop (w);
+ ev_timer_stop (w);
}
else if (w->repeat)
- evtimer_start (w);
+ ev_timer_start (w);
}
void
-evperiodic_start (struct ev_periodic *w)
+ev_periodic_start (struct ev_periodic *w)
{
if (ev_is_active (w))
return;
}
void
-evperiodic_stop (struct ev_periodic *w)
+ev_periodic_stop (struct ev_periodic *w)
{
ev_clear ((W)w);
if (!ev_is_active (w))
}
void
-evsignal_start (struct ev_signal *w)
+ev_signal_start (struct ev_signal *w)
{
if (ev_is_active (w))
return;
}
void
-evsignal_stop (struct ev_signal *w)
+ev_signal_stop (struct ev_signal *w)
{
ev_clear ((W)w);
if (!ev_is_active (w))
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 ((W)w);
if (ev_is_active (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;
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_stop ((W)w);
}
-void evcheck_start (struct ev_check *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 ((W)w);
if (ev_is_active (w))
ev_stop ((W)w);
}
-void evchild_start (struct ev_child *w)
+void
+ev_child_start (struct ev_child *w)
{
if (ev_is_active (w))
return;
wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
}
-void evchild_stop (struct ev_child *w)
+void
+ev_child_stop (struct ev_child *w)
{
ev_clear ((W)w);
if (ev_is_active (w))
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);
once->cb = cb;
once->arg = arg;
- evw_init (&once->io, once_cb_io);
+ ev_watcher_init (&once->io, once_cb_io);
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.)
{
- evtimer_set (&once->to, timeout, 0.);
- evtimer_start (&once->to);
+ ev_timer_set (&once->to, timeout, 0.);
+ ev_timer_start (&once->to);
}
}
}
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);
projects / software / libev.git / blobdiff