#include <sys/time.h>
#include <time.h>
-#ifdef CLOCK_MONOTONIC
-# define HAVE_MONOTONIC 1
+#ifndef HAVE_MONOTONIC
+# ifdef CLOCK_MONOTONIC
+# define HAVE_MONOTONIC 1
+# 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.
EV_WATCHER_LIST (ev_watcher_list);
};
+typedef struct ev_watcher *W;
+typedef struct ev_watcher_list *WL;
+
static ev_tstamp now, diff; /* monotonic clock */
ev_tstamp ev_now;
int ev_method;
typedef struct
{
- struct ev_watcher *w;
+ W w;
int events;
} ANPENDING;
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, );
int ev = w->events & events;
if (ev)
- event ((struct ev_watcher *)w, ev);
+ event ((W)w, ev);
}
}
+static void
+queue_events (W *events, int eventcnt, int type)
+{
+ int i;
+
+ for (i = 0; i < eventcnt; ++i)
+ event (events [i], type);
+}
+
/*****************************************************************************/
static struct ev_timer **atimers;
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);
}
}
/*****************************************************************************/
+static struct ev_idle **idles;
+static int idlemax, idlecnt;
+
+static struct ev_check **checks;
+static int checkmax, checkcnt;
+
+/*****************************************************************************/
+
#if HAVE_EPOLL
# include "ev_epoll.c"
#endif
/*****************************************************************************/
-static ev_hook hooks [EVHOOK_NUM];
-
-void
-ev_hook_register (int type, ev_hook hook)
-{
- hooks [type] = hook;
-}
-
-void
-ev_hook_unregister (int type, ev_hook hook)
-{
- hooks [type] = 0;
-}
-
-static void
-hook_call (int type)
-{
- if (hooks [type])
- hooks [type] ();
-}
-
static void
fd_reify (void)
{
--timercnt; /* maybe pass by reference instead? */
}
- event ((struct ev_watcher *)w, EV_TIMEOUT);
+ event ((W)w, EV_TIMEOUT);
}
}
double block;
ev_loop_done = flags & EVLOOP_ONESHOT;
- do
+ if (checkcnt)
{
- hook_call (EVHOOK_PREPOLL);
+ queue_events ((W *)checks, checkcnt, EV_CHECK);
+ call_pending ();
+ }
+ do
+ {
/* update fd-related kernel structures */
fd_reify ();
/* calculate blocking time */
- if (flags & EVLOOP_NONBLOCK)
+ if (flags & EVLOOP_NONBLOCK || idlecnt)
block = 0.;
else
{
/* update ev_now, do magic */
time_update ();
- hook_call (EVHOOK_POSTPOLL);
-
- /* put pending timers into pendign queue and reschedule them */
+ /* queue pending timers and reschedule them */
/* absolute timers first */
timers_reify (atimers, atimercnt, ev_now);
/* relative timers second */
timers_reify (rtimers, rtimercnt, now);
+ /* 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);
+
call_pending ();
}
while (!ev_loop_done);
/*****************************************************************************/
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
-wlist_del (struct ev_watcher_list **head, struct ev_watcher_list *elem)
+wlist_del (WL *head, WL elem)
{
while (*head)
{
}
static void
-ev_start (struct ev_watcher *w, int active)
+ev_start (W w, int active)
{
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;
int fd = w->fd;
- ev_start ((struct ev_watcher *)w, 1);
+ ev_start ((W)w, 1);
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, );
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, );
if (w->repeat)
w->at += ceil ((ev_now - w->at) / w->repeat) * w->repeat;
- ev_start ((struct ev_watcher *)w, ++atimercnt);
+ ev_start ((W)w, ++atimercnt);
array_needsize (atimers, atimermax, atimercnt, );
atimers [atimercnt - 1] = w;
upheap (atimers, atimercnt - 1);
{
w->at += now;
- ev_start ((struct ev_watcher *)w, ++rtimercnt);
+ ev_start ((W)w, ++rtimercnt);
array_needsize (rtimers, rtimermax, rtimercnt, );
rtimers [rtimercnt - 1] = w;
upheap (rtimers, rtimercnt - 1);
}
}
- ev_stop ((struct ev_watcher *)w);
+ ev_stop ((W)w);
}
void
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);
- 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 (!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);
}
+void evidle_start (struct ev_idle *w)
+{
+ if (ev_is_active (w))
+ return;
+
+ ev_start ((W)w, ++idlecnt);
+ array_needsize (idles, idlemax, idlecnt, );
+ idles [idlecnt - 1] = w;
+}
+
+void evidle_stop (struct ev_idle *w)
+{
+ idles [w->active - 1] = idles [--idlecnt];
+ ev_stop ((W)w);
+}
+
+void evcheck_start (struct ev_check *w)
+{
+ if (ev_is_active (w))
+ return;
+
+ ev_start ((W)w, ++checkcnt);
+ array_needsize (checks, checkmax, checkcnt, );
+ checks [checkcnt - 1] = w;
+}
+
+void evcheck_stop (struct ev_check *w)
+{
+ checks [w->active - 1] = checks [--checkcnt];
+ ev_stop ((W)w);
+}
+
/*****************************************************************************/
-#if 1
+
+#if 0
static void
sin_cb (struct ev_io *w, int revents)
fprintf (stderr, "signal %x,%d\n", revents, w->signum);
}
+static void
+gcb (struct ev_signal *w, int revents)
+{
+ fprintf (stderr, "generic %x\n", revents);
+}
+
int main (void)
{
struct ev_io sin;
struct ev_timer t[10000];
-#if 1
+#if 0
int i;
for (i = 0; i < 10000; ++i)
{
evsignal_set (&sig, SIGQUIT);
evsignal_start (&sig);
+ struct ev_check cw;
+ evw_init (&cw, gcb, 0);
+ evcheck_start (&cw);
+
+ struct ev_idle iw;
+ evw_init (&iw, gcb, 0);
+ evidle_start (&iw);
+
ev_loop (0);
return 0;