*** empty log message ***

[software/libev.git] / event.c

diff --git a/event.c b/event.c
index b73d16b7e66f7d37e4a84440965ffdddff6ab1dd..cf7739c0f64ff77dfb69e0f812a1c2de448c3fe4 100644 (file)
--- a/event.c
+++ b/event.c
@@ -91,7 +91,7 @@ void *event_init (void)
 #else
   assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 
 #else
   assert (("multiple event bases not supported when not compiled with EV_MULTIPLICITY", !x_cur));
 

-  x_cur = (struct event_base *)ev_default_loop (EVMETHOD_AUTO);
+  x_cur = (struct event_base *)(long)ev_default_loop (EVMETHOD_AUTO);

 #endif
 
   return x_cur;
 #endif
 
   return x_cur;


@@ -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)
 {
 
 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
   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)
 {
 
 int event_add (struct event *ev, struct timeval *tv)
 {

-  printf ("event add %p %p\n", ev, &ev->to);//D

   dLOOPev;
 
   /* disable all watchers */
   dLOOPev;
 
   /* disable all watchers */


@@ -219,7 +217,6 @@ int event_add (struct event *ev, struct timeval *tv)
 
 int event_del (struct event *ev)
 {
 
 int event_del (struct event *ev)
 {

-  printf ("event del %p\n", ev);//D

   dLOOPev;
 
   if (ev->ev_events & EV_SIGNAL)
   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);
     }
       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);
     }
 
     {
       /* 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);
 
   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;
     }
       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))
     {
       /* io */
       if (ev_is_active (&ev->iosig.io) || ev_is_pending (&ev->iosig.io))