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

Comparing libev/ev.c (file contents):
Revision 1.178 by root, Tue Dec 11 18:36:11 2007 UTC vs.
Revision 1.179 by root, Tue Dec 11 21:04:40 2007 UTC

       pendings [pri][w_->pending - 1].w      = w_;
       pendings [pri][w_->pending - 1].events = revents;
     }
 }
-void inline_size
+void inline_speed
 queue_events (EV_P_ W *events, int eventcnt, int type)
 {
   int i;
   for (i = 0; i < eventcnt; ++i)
 void inline_speed
 upheap (WT *heap, int k)
 {
   WT w = heap [k];
-  while (k && heap [k >> 1]->at > w->at)
+  while (k)
     {
+      int p = (k - 1) >> 1;
+      if (heap [p]->at <= w->at)
+        break;
-      heap [k] = heap [k >> 1];
+      heap [k] = heap [p];
       ((W)heap [k])->active = k + 1;
-      k >>= 1;
+      k = p;
     }
   heap [k] = w;
   ((W)heap [k])->active = k + 1;
 void inline_speed
 downheap (WT *heap, int N, int k)
 {
   WT w = heap [k];
-  while (k < (N >> 1))
+  for (;;)
     {
-      int j = k << 1;
+      int c = (k << 1) + 1;
-      if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
+      if (c >= N)
-        ++j;
-      if (w->at <= heap [j]->at)
         break;
+      c += c + 1 < N && heap [c]->at > heap [c + 1]->at
+           ? 1 : 0;
+      if (w->at <= heap [c]->at)
+        break;
-      heap [k] = heap [j];
+      heap [k] = heap [c];
       ((W)heap [k])->active = k + 1;
-      k = j;
+      k = c;
     }
   heap [k] = w;
   ((W)heap [k])->active = k + 1;
 }

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