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

Comparing libev/ev.c (file contents):
Revision 1.182 by root, Wed Dec 12 01:27:08 2007 UTC vs.
Revision 1.183 by root, Wed Dec 12 05:11:56 2007 UTC

   fdchangecnt = 0;
 }
 void inline_size
-fd_change (EV_P_ int fd)
+fd_change (EV_P_ int fd, int flags)
 {
-  if (expect_false (anfds [fd].reify))
+  unsigned char reify = anfds [fd].reify;
-    return;
-  anfds [fd].reify = 1;
+  anfds [fd].reify |= flags | 1;
+  if (expect_true (!reify))
+    {
-  ++fdchangecnt;
+      ++fdchangecnt;
-  array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
+      array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
-  fdchanges [fdchangecnt - 1] = fd;
+      fdchanges [fdchangecnt - 1] = fd;
+    }
 }
 void inline_speed
 fd_kill (EV_P_ int fd)
 {
   for (fd = 0; fd < anfdmax; ++fd)
     if (anfds [fd].events)
       {
         anfds [fd].events = 0;
-        fd_change (EV_A_ fd);
+        fd_change (EV_A_ fd, EV_IOFDSET);
       }
 }
 /*****************************************************************************/
   ev_start (EV_A_ (W)w, 1);
   array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
   wlist_add (&anfds[fd].head, (WL)w);
-  fd_change (EV_A_ fd);
+  fd_change (EV_A_ fd, w->events & EV_IOFDSET);
+  w->events &= ~ EV_IOFDSET;
 }
 void noinline
 ev_io_stop (EV_P_ ev_io *w)
 {
   assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
   wlist_del (&anfds[w->fd].head, (WL)w);
   ev_stop (EV_A_ (W)w);
-  fd_change (EV_A_ w->fd);
+  fd_change (EV_A_ w->fd, 0);
 }
 void noinline
 ev_timer_start (EV_P_ ev_timer *w)
 {

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