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

Comparing libev/ev.c (file contents):
Revision 1.138 by root, Sat Nov 24 09:48:38 2007 UTC vs.
Revision 1.139 by root, Sun Nov 25 09:24:37 2007 UTC

       {
         ANPENDING *p = pendings [pri] + --pendingcnt [pri];
         if (expect_true (p->w))
           {
+            assert (("non-pending watcher on pending list", p->w->pending));
             p->w->pending = 0;
             EV_CB_INVOKE (p->w, p->events);
           }
       }
 }
     {
       if (time_update_monotonic (EV_A))
         {
           ev_tstamp odiff = rtmn_diff;
-          for (i = 4; --i; ) /* loop a few times, before making important decisions */
+          /* loop a few times, before making important decisions.
+           * on the choice of "4": one iteration isn't enough,
+           * in case we get preempted during the calls to
+           * ev_time and get_clock. a second call is almost guarenteed
+           * to succeed in that case, though. and looping a few more times
+           * doesn't hurt either as we only do this on time-jumps or
+           * in the unlikely event of getting preempted here.
+           */
+          for (i = 4; --i; )
             {
               rtmn_diff = ev_rt_now - mn_now;
               if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
                 return; /* all is well */
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  {
+    int active = ((W)w)->active;
-  idles [((W)w)->active - 1] = idles [--idlecnt];
+    idles [active - 1] = idles [--idlecnt];
+    ((W)idles [active - 1])->active = active;
+  }
   ev_stop (EV_A_ (W)w);
 }
 void
 ev_prepare_start (EV_P_ ev_prepare *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  {
+    int active = ((W)w)->active;
-  prepares [((W)w)->active - 1] = prepares [--preparecnt];
+    prepares [active - 1] = prepares [--preparecnt];
+    ((W)prepares [active - 1])->active = active;
+  }
   ev_stop (EV_A_ (W)w);
 }
 void
 ev_check_start (EV_P_ ev_check *w)
 {
   ev_clear_pending (EV_A_ (W)w);
   if (expect_false (!ev_is_active (w)))
     return;
+  {
+    int active = ((W)w)->active;
-  checks [((W)w)->active - 1] = checks [--checkcnt];
+    checks [active - 1] = checks [--checkcnt];
+    ((W)checks [active - 1])->active = active;
+  }
   ev_stop (EV_A_ (W)w);
 }
 #ifndef SA_RESTART
 # define SA_RESTART 0

Diff Legend

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

Comparing libev/ev.c (file contents): Revision 1.138 by root, Sat Nov 24 09:48:38 2007 UTC vs. Revision 1.139 by root, Sun Nov 25 09:24:37 2007 UTC

Diff Legend

Comparing libev/ev.c (file contents):
Revision 1.138 by root, Sat Nov 24 09:48:38 2007 UTC vs.
Revision 1.139 by root, Sun Nov 25 09:24:37 2007 UTC