Changeset 1535 in kBuild for trunk/src/kmk/misc.c

Timestamp:

Apr 20, 2008 10:19:40 PM (17 years ago)

Author:

bird

Message:

Made the allocated and allocated-sum optional as they made xmalloc and xfree very expensive. New argument: --statistics / KMK_OPTS_STATISTICS=[1|0]

File:

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

trunk/src/kmk/misc.c

@@ -363 +363 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   make_stats_allocations++;
-  make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
-  make_stats_allocated_sum += SIZE_OF_HEAP_BLOCK (result);
+  if (make_expensive_statistics)
+    {
+      unsigned int actual_size = SIZE_OF_HEAP_BLOCK (result);
+      make_stats_allocated += actual_size;
+      make_stats_allocated_sum += actual_size;
+    }
 #endif
   return result;
@@ -375 +379 @@
   void *result;
 #ifdef CONFIG_WITH_MAKE_STATS
-  if (ptr != NULL) 
-    {
-      make_stats_allocated -= SIZE_OF_HEAP_BLOCK (ptr);
-      make_stats_allocated_sum -= SIZE_OF_HEAP_BLOCK (ptr);
+  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;
     }
 #endif
@@ -389 +394 @@
     fatal (NILF, _("virtual memory exhausted"));
 #ifdef CONFIG_WITH_MAKE_STATS
-  make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
-  make_stats_allocated_sum += SIZE_OF_HEAP_BLOCK (result);
+  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;
+    }
 #endif
   return result;
@@ -412 +423 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   make_stats_allocations++;
-  make_stats_allocated += SIZE_OF_HEAP_BLOCK (result);
-  make_stats_allocated_sum += SIZE_OF_HEAP_BLOCK (result);
+  if (make_expensive_statistics)
+    {
+      unsigned int actual_size = SIZE_OF_HEAP_BLOCK (result);
+      make_stats_allocated += actual_size;
+      make_stats_allocated_sum += actual_size;
+    }
 #endif
 #ifdef HAVE_STRDUP
@@ -950 +965 @@
 void xfree(void *ptr)
 {
-  if (ptr) 
+  if (ptr)
     {
       make_stats_allocations--;
-      make_stats_allocated -= SIZE_OF_HEAP_BLOCK (ptr);
+      if (make_expensive_statistics)
+        make_stats_allocated -= SIZE_OF_HEAP_BLOCK (ptr);
       free (ptr);
     }