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

Comparing libev/event.c (file contents):
Revision 1.31 by root, Wed Nov 14 05:30:02 2007 UTC vs.
Revision 1.32 by root, Thu Nov 29 12:21:06 2007 UTC

 static void
 x_cb_io (EV_P_ struct ev_io *w, int revents)
 {
   struct event *ev = (struct event *)(((char *)w) - offsetof (struct event, iosig.io));
-  if (revents & EV_ERROR)
+  if ((revents & EV_ERROR) || !(ev->ev_events & EV_PERSIST))
     event_del (ev);
-  else if (!(ev->ev_events & EV_PERSIST) && ev_is_active (w))
-    {
-      ev_io_stop (EV_A_ w);
-      ev->ev_flags &= ~EVLIST_INSERTED;
-    }
   x_cb (ev, revents);
 }
 static void
       ev->to.repeat = tv_get (tv);
       ev_timer_again (EV_A_ &ev->to);
       ev->ev_flags |= EVLIST_TIMEOUT;
     }
   else
-    if (ev_is_active (&ev->to))
+    {
       ev_timer_stop (EV_A_ &ev->to);
+      ev->ev_flags &= ~EVLIST_TIMEOUT;
+    }
   ev->ev_flags |= EVLIST_ACTIVE;
   return 0;
 }
 int event_del (struct event *ev)
 {
   dLOOPev;
   if (ev->ev_events & EV_SIGNAL)
-    {
-      /* sig */
-      if (ev_is_active (&ev->iosig.sig))
-        ev_signal_stop (EV_A_ &ev->iosig.sig);
+    ev_signal_stop (EV_A_ &ev->iosig.sig);
-    }
   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);
+    ev_io_stop (EV_A_ &ev->iosig.io);
-    }
   if (ev_is_active (&ev->to))
     ev_timer_stop (EV_A_ &ev->to);
   ev->ev_flags = EVLIST_INIT;

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