Changeset 2752 in kBuild for trunk/src/kmk

Timestamp:

Jan 23, 2015 8:38:01 PM (10 years ago)

Author:

bird

Message:

Added another variable statistic under #ifdef CONFIG_WITH_MAKE_STATS and made the makefile check for CONFIG_WITH_MAKE_STATS (instead of only enabling it for debug builds).

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (1 diff)
• variable.c (modified) (11 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/Makefile.kmk

@@ -201 +201 @@
 kmk_DEFS.win = CONFIG_NEW_WIN32_CTRL_EVENT CONFIG_WITH_FAST_IS_SPACE
 kmk_DEFS.debug = CONFIG_WITH_MAKE_STATS
+ifdef CONFIG_WITH_MAKE_STATS
+ kmk_DEFS += CONFIG_WITH_MAKE_STATS
+endif
 
 kmk_SOURCES = \

trunk/src/kmk/variable.c

@@ -447 +447 @@
   MAKE_STATS_2(v->changes = 0);
   MAKE_STATS_2(v->reallocs = 0);
+  MAKE_STATS_2(v->references = 0);
 
   v->exportable = 1;
@@ -892 +893 @@
       struct variable *v = lookup_kbuild_object_variable_accessor(name, length);
       if (v != VAR_NOT_KBUILD_ACCESSOR)
-        return v;
+        {
+          MAKE_STATS (v->references++);
+          return v;
+        }
     }
 # endif
@@ -925 +929 @@
           RESOLVE_ALIAS_VARIABLE(v);
 # endif
+         MAKE_STATS (v->references++);
           return v->special ? lookup_special_var (v) : v;
         }
@@ -1010 +1015 @@
 {
   struct variable var_key;
-  struct variable *v;
 #ifndef CONFIG_WITH_STRCACHE2
   var_key.name = (char *) name;
@@ -1018 +1022 @@
 #else  /* CONFIG_WITH_STRCACHE2 */
   const char *cached_name;
+  struct variable *v;
 
 # ifdef KMK
@@ -1027 +1032 @@
         {
           RESOLVE_ALIAS_VARIABLE(v);
+          MAKE_STATS (v->references++);
           return v;
         }
@@ -1054 +1060 @@
   RESOLVE_ALIAS_VARIABLE(v);
 # endif
+  MAKE_STATS (if (v) v->references++);
   return v;
 #endif /* CONFIG_WITH_STRCACHE2 */
@@ -2756 +2763 @@
 static unsigned long var_stats_changes, var_stats_changed;
 static unsigned long var_stats_reallocs, var_stats_realloced;
+static unsigned long var_stats_references, var_stats_referenced;
 static unsigned long var_stats_val_len, var_stats_val_alloc_len;
 static unsigned long var_stats_val_rdonly_len;
@@ -2832 +2840 @@
   var_stats_reallocs += v->reallocs;
   var_stats_realloced += (v->reallocs != 0);
+  if (v->references != 0)
+      printf (_(", %u references"), v->references);
+  var_stats_references += v->references;
+  var_stats_referenced += (v->references != 0);
   var_stats_val_len += v->value_length;
   if (v->value_alloc_len)
@@ -2888 +2900 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   var_stats_changes = var_stats_changed = var_stats_reallocs
-      = var_stats_realloced = var_stats_val_len = var_stats_val_alloc_len
-      = var_stats_val_rdonly_len = 0;
+    = var_stats_realloced = var_stats_references = var_stats_referenced
+    = var_stats_val_len = var_stats_val_alloc_len
+    = var_stats_val_rdonly_len = 0;
 
   hash_map_arg (&set->table, print_variable, prefix);
@@ -2918 +2931 @@
                (unsigned int)((100.0 * var_stats_realloced) / set->table.ht_fill),
                var_stats_reallocs);
+
+      if (var_stats_referenced)
+        printf(_("#  referenced %5lu (%2u%%),       references %6lu\n"),
+               var_stats_referenced,
+               (unsigned int)((100.0 * var_stats_referenced) / set->table.ht_fill),
+               var_stats_references);
       }
 #else

trunk/src/kmk/variable.h

@@ -110 +110 @@
       } export ENUM_BITFIELD (2);
 #ifdef CONFIG_WITH_MAKE_STATS
-    unsigned int changes;
-    unsigned int reallocs;
+    unsigned int changes;      /* Variable modification count.  */
+    unsigned int reallocs;     /* Realloc on value count.  */
+    unsigned int references;   /* Lookup count.  */
 #endif
   };