Changeset 1925 for trunk/src/kmk/misc.c

Timestamp:

Oct 24, 2008, 5:32:21 AM (17 years ago)

Author:

bird

Message:

kmk: some stats adjustments.

File:

• trunk/src/kmk/misc.c (modified) (4 diffs)

trunk/src/kmk/misc.c

@@ -1224 +1224 @@
   cache->free_head   = NULL;
   cache->size        = act_size;
+  cache->total_count = 0;
   cache->alloc_count = 0;
-  cache->total_count = 0;
+  cache->free_count  = 0;
   cache->name        = name;
   cache->grow_arg    = grow_arg;
@@ -1257 +1258 @@
   if (eat->free_head)
     {
+     unsigned int eat_in_use = eat->alloc_count - eat->free_count;
+     unsigned int dst_in_use = cache->alloc_count - cache->free_count;
      if (!cache->free_head)
        cache->free_head = eat->free_head;
-     else if (eat->total_count - eat->alloc_count < cache->total_count - cache->alloc_count)
+     else if (eat->total_count - eat_in_use < cache->total_count - dst_ins_use)
        {
          struct alloccache_free_ent *last = eat->free_head;
@@ -1287 +1290 @@
   /* and statistics */
   cache->alloc_count += eat->alloc_count;
-  cache->total_count += eat->total_count;
+  cache->free_count  += eat->free_count;
 #else
   /* and statistics */
   cache->alloc_count += eat->alloc_count;
-  cache->total_count += eat->alloc_count;
-#endif
+  cache->free_count  += eat->free_count;
+#endif
+  cache->total_count += eat->total_count;
 
   /* unlink and disable the eat cache */
@@ -1316 +1320 @@
 {
   printf (_("\n# Alloc Cache: %s\n"
-              "#  Items: size = %-3u  in-use = %-6d  total = %-6u\n"),
-          cache->name, cache->size, (int)cache->alloc_count, cache->total_count);
+              "#  Items: size = %-3u  total = %-6u"),
+          cache->name, cache->size, cache->total_count);
+  MAKE_STATS(printf (_("  in-use = %-6lu"),
+                     cache->alloc_count - cache->free_count););
+  MAKE_STATS(printf (_("\n#         alloc calls = %-7lu  free calls = %-7lu"),
+                     cache->alloc_count, cache->free_count););
+  printf ("\n");
 }