Changeset 2006 in kBuild

Timestamp:

Oct 30, 2008 2:15:35 AM (16 years ago)

Author:

bird

Message:

more stats and some minor adjustments.

File:

• trunk/src/kmk/variable.c (modified) (4 diffs)

trunk/src/kmk/variable.c

@@ -1645 +1645 @@
         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); /* extra for future */
+        v->value_alloc_len = VAR_ALIGN_VALUE_ALLOC (new_value_len + 1 + value_len /*future*/ );
 # ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
       if ((append || !v->value_length) && !v->rdonly_val)
@@ -2281 +2281 @@
 static unsigned long var_stats_changes, var_stats_changed;
 static unsigned long var_stats_reallocs, var_stats_realloced;
+static unsigned long var_stats_val_len, var_stats_val_alloc_len;
+static unsigned long var_stats_val_rdonly_len;
 #endif
 
@@ -2331 +2333 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   if (v->changes != 0)
-      printf(_(", %u changes"), v->changes);
+      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);
+      printf (_(", %u reallocs"), v->reallocs);
   var_stats_reallocs += v->reallocs;
   var_stats_realloced += (v->reallocs != 0);
+  var_stats_val_len += v->value_length;
+  if (v->value_alloc_len)
+    var_stats_val_alloc_len += v->value_alloc_len;
+  else
+    var_stats_val_rdonly_len += v->value_length;
+  assert (v->value_length == strlen (v->value));
+  /*assert (v->rdonly_val ? !v->value_alloc_len : v->value_alloc_len > v->value_length); - FIXME */
 #endif /* CONFIG_WITH_MAKE_STATS */
   putchar ('\n');
@@ -2379 +2388 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   var_stats_changes = var_stats_changed = var_stats_reallocs
-      = var_stats_realloced = 0;
+      = var_stats_realloced = var_stats_val_len = var_stats_val_alloc_len
+      = var_stats_val_rdonly_len = 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);
+  if (set->table.ht_fill)
+    {
+      unsigned long fragmentation;
+
+      fragmentation = var_stats_val_alloc_len - (var_stats_val_len - var_stats_val_rdonly_len);
+      printf(_("# variable set value stats:\n\
+#     strings %7lu bytes,       readonly %6lu bytes\n"),
+             var_stats_val_len, var_stats_val_rdonly_len, var_stats_val_alloc_len);
+
+      if (var_stats_val_alloc_len)
+        printf(_("#   allocated %7lu bytes,  fragmentation %6lu bytes (%u%%)\n"),
+               var_stats_val_alloc_len, fragmentation,
+               (unsigned int)((100.0 * fragmentation) / var_stats_val_alloc_len));
+
+      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);