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

Comparing libev/ev.c (file contents):
Revision 1.230 by root, Fri May 2 08:13:16 2008 UTC vs.
Revision 1.232 by root, Tue May 6 15:29:58 2008 UTC

     }
 }
 /*****************************************************************************/
+#define MALLOC_ROUND 4096 // prefer to allocate in chunks of this size, must be 2**n and >> 4 longs
 int inline_size
 array_nextsize (int elem, int cur, int cnt)
 {
   int ncur = cur + 1;
   do
     ncur <<= 1;
   while (cnt > ncur);
-  /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
+  /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
-  if (elem * ncur > 4096)
+  if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
     {
       ncur *= elem;
-      ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
+      ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
       ncur = ncur - sizeof (void *) * 4;
       ncur /= elem;
     }
   return ncur;
 pipecb (EV_P_ ev_io *iow, int revents)
 {
 #if EV_USE_EVENTFD
   if (evfd >= 0)
     {
-      uint64_t counter = 1;
+      uint64_t counter;
       read (evfd, &counter, sizeof (uint64_t));
     }
   else
 #endif
     {
 periodics_reschedule (EV_P)
 {
   int i;
   /* adjust periodics after time jump */
-  for (i = 0; i < periodiccnt; ++i)
+  for (i = 1; i <= periodiccnt; ++i)
     {
       ev_periodic *w = (ev_periodic *)periodics [i];
       if (w->reschedule_cb)
         ev_at (w) = w->reschedule_cb (w, ev_rt_now);

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