Changeset 1535 in kBuild

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]

Location:

trunk/src/kmk

Files:

• main.c (modified) (5 diffs)
• make.h (modified) (1 diff)
• misc.c (modified) (5 diffs)

trunk/src/kmk/main.c

@@ -311 +311 @@
     4 = high / nice -10;
     5 = realtime / nice -19; */
+
 int process_priority = 0;
 
 /* Process affinity mask; 0 means any CPU. */
+
 int process_affinity = 0;
 #endif /* KMK */
+
+#ifdef CONFIG_WITH_MAKE_STATS
+/* When set, we'll gather expensive statistics like for the heap. */
+
+int make_expensive_statistics = 0;
+#endif
 
 
@@ -406 +414 @@
   --pretty-command-printing   Makes the command echo easier to read.\n"),
 #endif
+#ifdef CONFIG_WITH_MAKE_STATS
+    N_("\
+  --statistics                Gather extra statistics for $(make-stats ).\n"),
+#endif
     NULL
   };
@@ -461 +473 @@
     { 'S', flag_off, &keep_going_flag, 1, 1, 0, 0, &default_keep_going_flag,
       "no-keep-going" },
+#ifdef KMK
+    { CHAR_MAX+14, flag, (char *) &make_expensive_statistics, 1, 1, 1, 0, 0,
+       "statistics" },
+#endif
     { 't', flag, &touch_flag, 1, 1, 1, 0, 0, "touch" },
     { 'v', flag, &print_version_flag, 1, 1, 0, 0, 0, "version" },
@@ -3349 +3365 @@
     char val[32];
     sprintf (val, "%u", job_slots);
-    define_variable ("KMK_OPTS_JOBS", sizeof("KMK_OPTS_JOBS") - 1, 
+    define_variable ("KMK_OPTS_JOBS", sizeof("KMK_OPTS_JOBS") - 1,
                      val, o_default, 1);
-    define_variable ("KMK_OPTS_KEEP_GOING", sizeof("KMK_OPTS_KEEP_GOING") - 1, 
+    define_variable ("KMK_OPTS_KEEP_GOING", sizeof("KMK_OPTS_KEEP_GOING") - 1,
                      keep_going_flag ? "1" : "0", o_default, 1);
-    define_variable ("KMK_OPTS_JUST_PRINT", sizeof("KMK_OPTS_JUST_PRINT") - 1, 
+    define_variable ("KMK_OPTS_JUST_PRINT", sizeof("KMK_OPTS_JUST_PRINT") - 1,
                      just_print_flag ? "1" : "0", o_default, 1);
-    define_variable ("KMK_OPTS_PRETTY_COMMAND_PRINTING", sizeof("KMK_OPTS_PRETTY_COMMAND_PRINTING") - 1, 
+    define_variable ("KMK_OPTS_PRETTY_COMMAND_PRINTING", sizeof("KMK_OPTS_PRETTY_COMMAND_PRINTING") - 1,
                      pretty_command_printing ? "1" : "0", o_default, 1);
     sprintf (val, "%u", process_priority);
-    define_variable ("KMK_OPTS_PRORITY", sizeof("KMK_OPTS_PRORITY") - 1, 
+    define_variable ("KMK_OPTS_PRORITY", sizeof("KMK_OPTS_PRORITY") - 1,
                      val, o_default, 1);
     sprintf (val, "%u", process_affinity);
-    define_variable ("KMK_OPTS_AFFINITY", sizeof("KMK_OPTS_AFFINITY") - 1, 
+    define_variable ("KMK_OPTS_AFFINITY", sizeof("KMK_OPTS_AFFINITY") - 1,
                      val, o_default, 1);
+    define_variable ("KMK_OPTS_STATISTICS", sizeof("KMK_OPTS_STATISTICS") - 1,
+                     make_expensive_statistics ? "1" : "0", o_default, 1);
   }
 #endif
@@ -3400 +3418 @@
 %s Copyright (c) 1998  Todd C. Miller <[email protected]>\n\
 %s\n",
-          precede, KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR, 
+          precede, KBUILD_VERSION_MAJOR, KBUILD_VERSION_MINOR,
           KBUILD_VERSION_PATCH, KBUILD_SVN_REV,
           precede, version_string,
-          precede, precede, precede, precede, precede, precede, 
+          precede, precede, precede, precede, precede, precede,
           precede, precede);
 #else

trunk/src/kmk/make.h

@@ -503 +503 @@
 extern int pretty_command_printing;
 #endif
+#ifdef CONFIG_WITH_MAKE_STATS
+extern int make_expensive_statistics;
+#endif
+
 
 /* can we run commands via 'sh -c xxx' or must we use batch files? */

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);
     }