Changeset 2005 in kBuild for trunk

Timestamp:

Oct 30, 2008 1:45:47 AM (16 years ago)

Author:

bird

Message:

more variable modification stats.

Location:

trunk/src/kmk

Files:

• variable.c (modified) (6 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/variable.c

@@ -297 +297 @@
           v->origin = origin;
           v->recursive = recursive;
+          MAKE_STATS_2(v->changes++);
         }
       return v;
@@ -1639 +1640 @@
   if (v->value_alloc_len <= new_value_len + 1)
     {
-      v->value_alloc_len *= 2;
+      if (v->value_alloc_len < 256)
+        v->value_alloc_len = 256;
+      else
+        v->value_alloc_len *= 2;
       if (v->value_alloc_len < new_value_len + 1)
-          v->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (new_value_len + 1 + value_len + 1);
+        v->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (new_value_len + 1 + value_len); /* extra for future */
 # ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
       if ((append || !v->value_length) && !v->rdonly_val)
@@ -2084 +2088 @@
 #endif
 
-  MAKE_STATS_2(v->changes++);
   return v->special ? set_special_var (v) : v;
 }
@@ -2275 +2278 @@
 
 
+#ifdef CONFIG_WITH_MAKE_STATS
+static unsigned long var_stats_changes, var_stats_changed;
+static unsigned long var_stats_reallocs, var_stats_realloced;
+#endif
+
 /* Print information for variable V, prefixing it with PREFIX.  */
 
@@ -2321 +2329 @@
     printf (_(" (from `%s', line %lu)"),
             v->fileinfo.filenm, v->fileinfo.lineno);
-  MAKE_STATS_2(if (v->changes != 1) printf(_(", %u changes"), v->changes));
-  MAKE_STATS_2(if (v->reallocs != 0) printf(_(", %u reallocs"), v->reallocs));
+#ifdef CONFIG_WITH_MAKE_STATS
+  if (v->changes != 0)
+      printf(_(", %u changes"), v->changes);
+  var_stats_changes += v->changes;
+  var_stats_changed += (v->changes != 0);
+  if (v->reallocs != 0)
+      printf(_(", %u reallocs"), v->reallocs);
+  var_stats_reallocs += v->reallocs;
+  var_stats_realloced += (v->reallocs != 0);
+#endif /* CONFIG_WITH_MAKE_STATS */
   putchar ('\n');
   fputs (prefix, stdout);
@@ -2361 +2377 @@
 print_variable_set (struct variable_set *set, char *prefix)
 {
+#ifdef CONFIG_WITH_MAKE_STATS
+  var_stats_changes = var_stats_changed = var_stats_reallocs
+      = var_stats_realloced = 0;
+
   hash_map_arg (&set->table, print_variable, prefix);
+
+  if (var_stats_changed || var_stats_realloced)
+    printf(_("# variable set modification stats:\n"));
+  if (var_stats_changed)
+    printf(_("#     changed %5lu (%2u%%),        changes %6lu\n"),
+           var_stats_changed,
+           (unsigned int)((100.0 * var_stats_changed) / set->table.ht_fill),
+           var_stats_changes);
+  if (var_stats_realloced)
+    printf(_("# reallocated %5lu (%2u%%),  reallocations %6lu\n"),
+           var_stats_realloced,
+           (unsigned int)((100.0 * var_stats_realloced) / set->table.ht_fill),
+           var_stats_reallocs);
+#else
+  hash_map_arg (&set->table, print_variable, prefix);
+#endif
 
   fputs (_("# variable set hash-table stats:\n"), stdout);

trunk/src/kmk/variable.h

@@ -55 +55 @@
 #define EXP_COUNT_MAX   ((1<<EXP_COUNT_BITS)-1)
 #ifdef CONFIG_WITH_VALUE_LENGTH
-#define VAR_ALIGN_VALUE_ALLOC(len)  ( ((len) + (unsigned int)31) & ~(unsigned int)31 )
+#define VAR_ALIGN_VALUE_ALLOC(len)  ( ((len) + (unsigned int)15) & ~(unsigned int)15 )
 #endif