[ViewVC] Diff of: cvs/libev/event.c

Comparing libev/event.c (file contents):
Revision 1.15 by root, Sun Nov 4 20:38:07 2007 UTC vs.
Revision 1.16 by root, Sun Nov 4 22:03:17 2007 UTC

   x_cb (ev, 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
     ev_watcher_init (&ev->iosig.io, x_cb_io);
   return event_base_once (x_cur, fd, events, cb, arg, tv);
 }
 int event_add (struct event *ev, struct timeval *tv)
 {
-  printf ("event add %p %p\n", ev, &ev->to);//D
   dLOOPev;
   /* disable all watchers */
   event_del (ev);
   return 0;
 }
 int event_del (struct event *ev)
 {
-  printf ("event del %p\n", ev);//D
   dLOOPev;
   if (ev->ev_events & EV_SIGNAL)
     {
       /* 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);
     }
-  printf ("to %p %d\n", &ev->to, ev->to.active);//D
   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
   return 0;
 }
     {
       /* sig */
       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))
         revents |= ev->ev_events & (EV_READ | EV_WRITE);
     }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines