pike.git/ src/ block_allocator.c

2014-12-04

2014-12-04 19:24:06 by Per Hedbor <ph@opera.com>

• 55ed523e57720c459c23fa1e5350773c0a9e106e (16 lines) (+10/-6) ^{[ Show | Annotate ]}
  Branch: bill/master_archive_support

Fixed count_all in the block allocator.

The memory_info() function had a tendency to return values like
0 objects, total 120Kb

127:   }      PMOD_EXPORT void ba_count_all(const struct block_allocator * a, size_t * num, size_t * size) { -  if (a->size) { -  size_t n = (a->l.blocks << (a->size-1)) - a->l.blocks; +  size_t n = 0, b = sizeof( struct block_allocator ); +  unsigned int i; +  for( i=0; i<a->size; i++ ) +  { +  struct ba_layout l = ba_get_layout( a, i ); +  b += l.offset + l.block_size + l.doffset; +  n += a->pages[i]->h.used; +  }    *num = n; -  *size = a->l.block_size * n; -  } else { -  *num = *size = 0; +  *size = b;   } - } +       static void ba_low_alloc(struct block_allocator * a) {    if (a->l.offset) {