--------------------- PatchSet 2211 Date: 2001/05/04 16:47:21 Author: akroonmaa Branch: chunked_mempools Tag: (none) Log: fix minor bug. returned cumulated stats instead of for a pool. Members: lib/MemPool.c:1.1.2.16->1.1.2.17 Index: squid/lib/MemPool.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/Attic/MemPool.c,v retrieving revision 1.1.2.16 retrieving revision 1.1.2.17 diff -u -r1.1.2.16 -r1.1.2.17 --- squid/lib/MemPool.c 4 May 2001 14:40:44 -0000 1.1.2.16 +++ squid/lib/MemPool.c 4 May 2001 16:47:21 -0000 1.1.2.17 @@ -479,8 +479,7 @@ TheMeter.gb_freed.count = 0; TheMeter.gb_freed.bytes = 0; - iter = memPoolIterate(); - while ((pool = memPoolIterateNext(iter))) { + for (iter = memPoolIterate(); (pool = memPoolIterateNext(iter)); ) { memPoolFlushMetersFull(pool); memMeterAdd(TheMeter.alloc, pool->meter.alloc.level * pool->obj_size); memMeterAdd(TheMeter.inuse, pool->meter.inuse.level * pool->obj_size); @@ -490,6 +489,7 @@ TheMeter.gb_saved.bytes += pool->meter.gb_saved.bytes; TheMeter.gb_freed.bytes += pool->meter.gb_freed.bytes; } + memPoolIterateDone(&iter); } void * @@ -687,7 +687,7 @@ stats->overhead += sizeof(MemPool) + pool->chunkCount * sizeof(MemChunk) + strlen(pool->label) + 1; - return stats->items_inuse; + return pool->meter.inuse.level; } /*