--------------------- PatchSet 1863 Date: 2001/04/10 09:58:22 Author: akroonmaa Branch: chunked_mempools Tag: (none) Log: add total allocs counter to cachemgr output as it is in HEAD Members: src/MemPoolStats.c:1.1.2.1->1.1.2.2 Index: squid/src/MemPoolStats.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/Attic/MemPoolStats.c,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -r1.1.2.1 -r1.1.2.2 --- squid/src/MemPoolStats.c 6 Apr 2001 08:45:28 -0000 1.1.2.1 +++ squid/src/MemPoolStats.c 10 Apr 2001 09:58:22 -0000 1.1.2.2 @@ -171,7 +171,7 @@ int alloc_count, int inuse_count, int idle_count, StoreEntry * e) { assert(pm); - storeAppendPrintf(e, "%d\t %d\t %d\t %.2f\t %d\t %d\t %d\t %d\t %d\t %d\t %d\t %d\t %d\t %.1f\t %.1f\t %.1f\n", + storeAppendPrintf(e, "%d\t %d\t %d\t %.2f\t %d\t %d\t %d\t %d\t %d\t %d\t %d\t %d\t %d\t %.1f\t %.1f\t %.1f %d\n", /* alloc */ alloc_count, toKB(obj_size * pm->alloc.level), @@ -192,7 +192,8 @@ pm->saved.count, xpercent(pm->saved.count, mem_traffic_volume.count), xpercent(obj_size * gb_to_double(&pm->saved), gb_to_double(&mem_traffic_volume)), - xpercent(pm->saved.count, pm->total.count)); + xpercent(pm->saved.count, pm->total.count), + pm->total.count); } /* to-do: make debug level a parameter? */ @@ -268,15 +269,16 @@ /* heading */ storeAppendPrintf(e, "Pool\t Obj Size\t" " Chunks\t\t\t\t\t\t" - "Allocated\t\t\t\t\t In Use\t\t\t\t Idle\t\t\t Allocations Saved\t\t\t Hit Rate\t\n" + "Allocated\t\t\t\t\t In Use\t\t\t\t Idle\t\t\t Allocations Saved\t\t\t Hit Rate\tAllocs\t\n" " \t (bytes)\t" "KB/ch\t obj/ch\t" "(#)\t used\t free\t %Fragm\t " "(#)\t (KB)\t high (KB)\t high (hrs)\t %%Tot\t" "(#)\t (KB)\t high (KB)\t %%alloc\t" "(#)\t (KB)\t high (KB)\t" - "(count)\t %%cnt\t %%vol\t" - "%%num" + "(#)\t %%cnt\t %%vol\t" + "(%%num)\t" + "(#)" "\n"); /* main table */ for (i = 0; i < Pools.count ; i++) {