Browse Source

half-assed ev_flags emulation

master
Marc Alexander Lehmann 14 years ago
parent
commit
0340a0c046
  1. 16
      event.c
  2. 10
      event.h

16
event.c

@ -163,7 +163,10 @@ x_cb_io (EV_P_ struct ev_io *w, int revents)
if (revents & EV_ERROR)
event_del (ev);
else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
ev_io_stop (EV_A_ w);
{
ev_io_stop (EV_A_ w);
ev->ev_flags &= ~EVLIST_INSERTED;
}
x_cb (ev, revents);
}
@ -194,6 +197,7 @@ void event_set (struct event *ev, int fd, short events, void (*cb)(int, short, v
ev->ev_callback = cb;
ev->ev_arg = arg;
ev->ev_res = 0;
ev->ev_flags = EVLIST_INIT;
}
int event_once (int fd, short events, void (*cb)(int, short, void *), void *arg, struct timeval *tv)
@ -212,19 +216,27 @@ int event_add (struct event *ev, struct timeval *tv)
{
ev_signal_set (&ev->iosig.sig, ev->ev_fd);
ev_signal_start (EV_A_ &ev->iosig.sig);
ev->ev_flags |= EVLIST_SIGNAL;
}
else if (ev->ev_events & (EV_READ | EV_WRITE))
{
ev_io_set (&ev->iosig.io, ev->ev_fd, ev->ev_events & (EV_READ | EV_WRITE));
ev_io_start (EV_A_ &ev->iosig.io);
ev->ev_flags |= EVLIST_INSERTED;
}
if (tv)
{
ev_timer_set (&ev->to, tv_get (tv), 0.);
ev_timer_start (EV_A_ &ev->to);
ev->ev_flags |= EVLIST_TIMEOUT;
}
ev->ev_flags |= EVLIST_ACTIVE;
return 0;
}
@ -248,6 +260,8 @@ int event_del (struct event *ev)
if (ev_is_active (&ev->to))
ev_timer_stop (EV_A_ &ev->to);
ev->ev_flags = EVLIST_INIT;
return 0;
}

10
event.h

@ -43,6 +43,13 @@ extern "C" {
struct event_base;
#define EVLIST_TIMEOUT 0x01
#define EVLIST_INSERTED 0x02
#define EVLIST_SIGNAL 0x04
#define EVLIST_ACTIVE 0x08
#define EVLIST_INTERNAL 0x10
#define EVLIST_INIT 0x80
struct event
{
/* libev watchers we map onto */
@ -59,6 +66,7 @@ struct event
int ev_fd;
int ev_pri;
int ev_res;
int ev_flags;
short ev_events;
};
@ -67,7 +75,7 @@ struct event
#define EVENT_SIGNAL(ev) ((int) (ev)->ev_fd)
#define EVENT_FD(ev) ((int) (ev)->ev_fd)
#define event_initialized(ev) 1
#define event_initialized(ev) ((ev)->ev_flags & EVLIST_INIT)
#define evtimer_add(ev,tv) event_add (ev, tv)
#define evtimer_set(ev,cb,data) event_set (ev, -1, 0, cb, data)

Loading…
Cancel
Save