Browse Source

need to rethinkg design, maybe use 'proper' struct subclassing due to aliasing restrictions in C

master
Marc Alexander Lehmann 14 years ago
parent
commit
a0113c3cec
3 changed files with 58 additions and 22 deletions
  1. +38
    -16
      ev.c
  2. +16
    -6
      ev.h
  3. +4
    -0
      event.c

+ 38
- 16
ev.c View File

@ -94,6 +94,14 @@
# define EV_USE_KQUEUE 0
#endif
#ifndef EV_USE_WIN32
# ifdef WIN32
# define EV_USE_WIN32 1
# else
# define EV_USE_WIN32 0
# endif
#endif
#ifndef EV_USE_REALTIME
# define EV_USE_REALTIME 1
#endif
@ -351,9 +359,9 @@ fd_ebadf (EV_P)
static void
fd_enomem (EV_P)
{
int fd = anfdmax;
int fd;
while (fd--)
for (fd = anfdmax; fd--; )
if (anfds [fd].events)
{
close (fd);
@ -387,12 +395,12 @@ upheap (WT *heap, int k)
while (k && heap [k >> 1]->at > w->at)
{
heap [k] = heap [k >> 1];
heap [k]->active = k + 1;
((W)heap [k])->active = k + 1;
k >>= 1;
}
heap [k] = w;
heap [k]->active = k + 1;
((W)heap [k])->active = k + 1;
}
@ -412,12 +420,12 @@ downheap (WT *heap, int N, int k)
break;
heap [k] = heap [j];
heap [k]->active = k + 1;
((W)heap [k])->active = k + 1;
k = j;
}
heap [k] = w;
heap [k]->active = k + 1;
((W)heap [k])->active = k + 1;
}
/*****************************************************************************/
@ -610,6 +618,9 @@ loop_init (EV_P_ int methods)
methods = EVMETHOD_ANY;
method = 0;
#if EV_USE_WIN32
if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
#endif
#if EV_USE_KQUEUE
if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
#endif
@ -628,6 +639,9 @@ loop_init (EV_P_ int methods)
void
loop_destroy (EV_P)
{
#if EV_USE_WIN32
if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
#endif
#if EV_USE_KQUEUE
if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
#endif
@ -1120,6 +1134,8 @@ ev_timer_start (EV_P_ struct ev_timer *w)
array_needsize (timers, timermax, timercnt, );
timers [timercnt - 1] = w;
upheap ((WT *)timers, timercnt - 1);
assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
}
void
@ -1129,10 +1145,12 @@ ev_timer_stop (EV_P_ struct ev_timer *w)
if (!ev_is_active (w))
return;
if (w->active < timercnt--)
assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
if (((W)w)->active < timercnt--)
{
timers [w->active - 1] = timers [timercnt];
downheap ((WT *)timers, timercnt, w->active - 1);
timers [((W)w)->active - 1] = timers [timercnt];
downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
}
w->at = w->repeat;
@ -1148,7 +1166,7 @@ ev_timer_again (EV_P_ struct ev_timer *w)
if (w->repeat)
{
w->at = mn_now + w->repeat;
downheap ((WT *)timers, timercnt, w->active - 1);
downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
}
else
ev_timer_stop (EV_A_ w);
@ -1173,6 +1191,8 @@ ev_periodic_start (EV_P_ struct ev_periodic *w)
array_needsize (periodics, periodicmax, periodiccnt, );
periodics [periodiccnt - 1] = w;
upheap ((WT *)periodics, periodiccnt - 1);
assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
}
void
@ -1182,10 +1202,12 @@ ev_periodic_stop (EV_P_ struct ev_periodic *w)
if (!ev_is_active (w))
return;
if (w->active < periodiccnt--)
assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
if (((W)w)->active < periodiccnt--)
{
periodics [w->active - 1] = periodics [periodiccnt];
downheap ((WT *)periodics, periodiccnt, w->active - 1);
periodics [((W)w)->active - 1] = periodics [periodiccnt];
downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
}
ev_stop (EV_A_ (W)w);
@ -1209,7 +1231,7 @@ ev_idle_stop (EV_P_ struct ev_idle *w)
if (ev_is_active (w))
return;
idles [w->active - 1] = idles [--idlecnt];
idles [((W)w)->active - 1] = idles [--idlecnt];
ev_stop (EV_A_ (W)w);
}
@ -1231,7 +1253,7 @@ ev_prepare_stop (EV_P_ struct ev_prepare *w)
if (ev_is_active (w))
return;
prepares [w->active - 1] = prepares [--preparecnt];
prepares [((W)w)->active - 1] = prepares [--preparecnt];
ev_stop (EV_A_ (W)w);
}
@ -1253,7 +1275,7 @@ ev_check_stop (EV_P_ struct ev_check *w)
if (ev_is_active (w))
return;
checks [w->active - 1] = checks [--checkcnt];
checks [((W)w)->active - 1] = checks [--checkcnt];
ev_stop (EV_A_ (W)w);
}


+ 16
- 6
ev.h View File

@ -98,9 +98,9 @@ struct ev_loop;
#define EV_WATCHER(type) \
int active; /* private */ \
int pending; /* private */ \
int priority; /* ro */ \
int priority; /* private */ \
EV_COMMON; /* rw */ \
void (*cb)(EV_P_ struct type *, int revents); /* rw */ /* gets invoked with an eventmask */
void (*cb)(EV_P_ struct type *, int revents); /* private */ /* gets invoked with an eventmask */
#define EV_WATCHER_LIST(type) \
EV_WATCHER (type); \
@ -206,6 +206,7 @@ struct ev_child
#define EVMETHOD_KQUEUE 8
#define EVMETHOD_DEVPOLL 16 /* NYI */
#define EVMETHOD_PORT 32 /* NYI */
#define EVMETHOD_WIN32 64 /* NYI */
#define EVMETHOD_ANY ~0 /* any method, do not consult env */
#if EV_PROTOTYPES
@ -263,7 +264,12 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
/* these may evaluate ev multiple times, and the other arguments at most once */
/* either use ev_watcher_init + ev_TYPE_set, or the ev_TYPE_init macro, below, to first initialise a watcher */
#define ev_watcher_init(ev,cb_) do { (ev)->active = (ev)->pending = (ev)->priority = 0; (ev)->cb = (cb_); } while (0)
#define ev_watcher_init(ev,cb_) do { \
((struct ev_watcher *)(ev))->active = \
((struct ev_watcher *)(ev))->pending = \
((struct ev_watcher *)(ev))->priority = 0; \
((struct ev_watcher *)(ev))->cb = (cb_); \
} while (0)
#define ev_io_set(ev,fd_,events_) do { (ev)->fd = (fd_); (ev)->events = (events_); } while (0)
#define ev_timer_set(ev,after_,repeat_) do { (ev)->at = (after_); (ev)->repeat = (repeat_); } while (0)
@ -283,9 +289,13 @@ void ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revent
#define ev_check_init(ev,cb) do { ev_watcher_init ((ev), (cb)); ev_check_set ((ev)); } while (0)
#define ev_child_init(ev,cb,pid) do { ev_watcher_init ((ev), (cb)); ev_child_set ((ev),(pid)); } while (0)
#define ev_is_pending(ev) (0 + (ev)->pending) /* true when watcher is waiting for callback invocation */
#define ev_is_active(ev) (0 + (ev)->active) /* true when the watcher has been started */
#define ev_set_priority(ev,pri) (ev)->priority = pri
#define ev_is_pending(ev) (0 + ((struct ev_watcher *)(ev))->pending) /* ro, true when watcher is waiting for callback invocation */
#define ev_is_active(ev) (0 + ((struct ev_watcher *)(ev))->active) /* ro, true when the watcher has been started */
#define ev_priority(ev) ((struct ev_watcher *)(ev))->priority /* rw */
#define ev_cb(ev) ((struct ev_watcher *)(ev))->cb /* rw */
#define ev_set_priority(ev,pri) ev_priority (ev) = (pri)
#define ev_set_cb(ev,cb_) ev_cb (ev) = (cb_)
/* stopping (enabling, adding) a watcher does nothing if it is already running */
/* stopping (disabling, deleting) a watcher does nothing unless its already running */


+ 4
- 0
event.c View File

@ -167,6 +167,7 @@ x_cb_to (EV_P_ struct ev_timer *w, int revents)
void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, void *), void *arg)
{
printf ("event set %p\n", ev);//D
if (events & EV_SIGNAL)
ev_watcher_init (&ev->iosig.sig, x_cb_sig);
else
@ -190,6 +191,7 @@ int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg,
int event_add (struct event *ev, struct timeval *tv)
{
printf ("event add %p %p\n", ev, &ev->to);//D
dLOOPev;
/* disable all watchers */
@ -217,6 +219,7 @@ int event_add (struct event *ev, struct timeval *tv)
int event_del (struct event *ev)
{
printf ("event del %p\n", ev);//D
dLOOPev;
if (ev->ev_events & EV_SIGNAL)
@ -232,6 +235,7 @@ int event_del (struct event *ev)
ev_io_stop (EV_A_ &ev->iosig.io);
}
printf ("to %p %d\n", &ev->to, ev->to.active);//D
if (ev_is_active (&ev->to))
ev_timer_stop (EV_A_ &ev->to);


Loading…
Cancel
Save