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

Comparing libev/ev.c (file contents):
Revision 1.236 by root, Wed May 7 14:46:22 2008 UTC vs.
Revision 1.237 by root, Wed May 7 15:16:56 2008 UTC

  * the difference is about 5% with 50000+ watchers.
  */
 #define USE_4HEAP !EV_MINIMAL
 #if USE_4HEAP
+#define DHEAP 4
-#define HEAP0 3 /* index of first element in heap */
+#define HEAP0 (DHEAP - 1) /* index of first element in heap */
 /* towards the root */
 void inline_speed
 upheap (WT *heap, int k)
 {
   WT w = heap [k];
   for (;;)
     {
-      int p = ((k - HEAP0 - 1) / 4) + HEAP0;
+      int p = ((k - HEAP0 - 1) / DHEAP) + HEAP0;
       if (p >= HEAP0 || heap [p]->at <= w->at)
         break;
       heap [k] = heap [p];
   for (;;)
     {
       ev_tstamp minat;
       WT *minpos;
-      WT *pos = heap + 4 * (k - HEAP0) + HEAP0;
+      WT *pos = heap + DHEAP * (k - HEAP0) + HEAP0;
       // find minimum child
-      if (expect_true (pos +3 < E))
+      if (expect_true (pos + DHEAP - 1 < E))
         {
           /* fast path */
                                    (minpos = pos + 0), (minat = (*minpos)->at);
           if (pos [1]->at < minat) (minpos = pos + 1), (minat = (*minpos)->at);
           if (pos [2]->at < minat) (minpos = pos + 2), (minat = (*minpos)->at);

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