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

Timestamp:

Oct 28, 2008, 2:59:10 AM (17 years ago)

Author:

bird

Message:

kmk: some make stats cleanup.

File:

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

trunk/src/kmk/misc.c

@@ -398 +398 @@
   if (result == 0)
     fatal (NILF, _("virtual memory exhausted"));
+
 #ifdef CONFIG_WITH_MAKE_STATS
   make_stats_allocations++;
   if (make_expensive_statistics)
-    {
-      unsigned int actual_size = SIZE_OF_HEAP_BLOCK (result);
-      make_stats_allocated += actual_size;
-      make_stats_allocated_sum += actual_size;
-    }
+    make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
+  else
+    make_stats_allocated += size;
 #endif
   return result;
@@ -417 +416 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   if (make_expensive_statistics && ptr != NULL)
-    {
-      unsigned int actual_size = SIZE_OF_HEAP_BLOCK (ptr);
-      make_stats_allocated -= actual_size;
-      make_stats_allocated_sum -= actual_size;
-    }
+    make_stats_allocated -= SIZE_OF_HEAP_BLOCK (ptr);
+  if (ptr)
+    make_stats_reallocations++;
+  else
+    make_stats_allocations++;
 #endif
 
@@ -430 +429 @@
   if (result == 0)
     fatal (NILF, _("virtual memory exhausted"));
+
 #ifdef CONFIG_WITH_MAKE_STATS
-  if (!ptr)
-    make_stats_allocations++;
   if (make_expensive_statistics)
-    {
-      unsigned int actual_size = SIZE_OF_HEAP_BLOCK (result);
-      make_stats_allocated += actual_size;
-      make_stats_allocated_sum += actual_size;
-    }
+    make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
+  else
+    make_stats_allocated += size;
 #endif
   return result;
@@ -461 +457 @@
   make_stats_allocations++;
   if (make_expensive_statistics)
-    {
-      unsigned int actual_size = SIZE_OF_HEAP_BLOCK (result);
-      make_stats_allocated += actual_size;
-      make_stats_allocated_sum += actual_size;
-    }
+    make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
+  else
+    make_stats_allocated += strlen (ptr) + 1;
 #endif
 #ifdef HAVE_STRDUP
@@ -1165 +1159 @@
 }
 
-#if defined(CONFIG_WITH_MAKE_STATS) && !defined(ELECTRIC_HEAP)
-#undef free
-void xfree(void *ptr)
-{
-  if (ptr)
-    {
-      make_stats_allocations--;
-      if (make_expensive_statistics)
-        make_stats_allocated -= SIZE_OF_HEAP_BLOCK (ptr);
-      free (ptr);
-    }
-}
-#endif
-
-
 #ifdef CONFIG_WITH_ALLOC_CACHES
 
@@ -1403 +1382 @@
 # endif /* __GLIBC__ */
 
+# ifdef CONFIG_WITH_MAKE_STATS
+  printf(_("#            %lu malloc calls,  %lu realloc calls\n"),
+         make_stats_allocations, make_stats_reallocations);
+  printf(_("#            %lu MBs alloc sum, not counting freed, add pinch of salt\n"), /* XXX: better wording */
+         make_stats_allocated / (1024*1024));
+# endif
+
   /* XXX: windows */
 }