summaryrefslogtreecommitdiff
path: root/event.c
diff options
context:
space:
mode:
Diffstat (limited to 'event.c')
-rw-r--r--event.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/event.c b/event.c
index b73d16b..b34774c 100644
--- a/event.c
+++ b/event.c
@@ -167,7 +167,6 @@ 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
@@ -191,7 +190,6 @@ 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 */
@@ -219,7 +217,6 @@ 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)
@@ -228,14 +225,13 @@ int event_del (struct event *ev)
if (ev_is_active (&ev->iosig.sig))
ev_signal_stop (EV_A_ &ev->iosig.sig);
}
- else
+ else if (ev->ev_events & (EV_READ | EV_WRITE))
{
/* io */
if (ev_is_active (&ev->iosig.io))
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);
@@ -254,7 +250,7 @@ int event_pending (struct event *ev, short events, struct timeval *tv)
if (ev_is_active (&ev->iosig.sig) || ev_is_pending (&ev->iosig.sig))
revents |= EV_SIGNAL;
}
- else
+ else if (ev->ev_events & (EV_READ | EV_WRITE))
{
/* io */
if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))