Changeset 2771 for trunk/src/kmk/variable.c

Timestamp:

Feb 1, 2015, 9:48:36 PM (10 years ago)

Author:

bird

Message:

Optimizations, tuning and bug fixes for the 'compiled' string expansion code.

File:

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

trunk/src/kmk/variable.c

@@ -449 +449 @@
   v->export = v_default;
 #ifdef CONFIG_WITH_COMPILER
+  v->recursive_without_dollar = 0;
   v->evalprog = 0;
   v->expandprog = 0;
@@ -617 +618 @@
       v->export = v_default;
 #ifdef CONFIG_WITH_COMPILER
+      v->recursive_without_dollar = 0;
       v->evalprog = 0;
       v->expandprog = 0;
@@ -2867 +2869 @@
 static unsigned long var_stats_expands, var_stats_expanded;
 #endif
+#ifdef CONFIG_WITH_COMPILER
+static unsigned long var_stats_expandprogs, var_stats_evalprogs;
+#endif
 #ifdef CONFIG_WITH_MAKE_STATS
 static unsigned long var_stats_changes, var_stats_changed;
@@ -2940 +2945 @@
 #if defined (CONFIG_WITH_COMPILER) || defined (CONFIG_WITH_MAKE_STATS)
   if (v->evalval_count != 0)
+    {
 # ifdef CONFIG_WITH_MAKE_STATS
-    printf (_(", %u evalvals (%llu ticks)"), v->evalval_count, v->cTicksEvalVal);
+      printf (_(", %u evalvals (%llu ticks)"), v->evalval_count, v->cTicksEvalVal);
 # else
-    printf (_(", %u evalvals"), v->evalval_count);
+      printf (_(", %u evalvals"), v->evalval_count);
 # endif
+      var_stats_evalvaled++;
+    }
   var_stats_evalvals += v->evalval_count;
-  var_stats_evalvaled += (v->evalval_count != 0);
 
   if (v->expand_count != 0)
-    printf (_(", %u expands"), v->expand_count);
+    {
+      printf (_(", %u expands"), v->expand_count);
+      var_stats_expanded++;
+    }
   var_stats_expands += v->expand_count;
-  var_stats_expanded += (v->expand_count != 0);
+
 # ifdef CONFIG_WITH_COMPILER
   if (v->evalprog != 0)
-    printf (_(", evalprog"));
+    {
+      printf (_(", evalprog"));
+      var_stats_evalprogs++;
+    }
   if (v->expandprog != 0)
-    printf (_(", expandprog"));
+    {
+      printf (_(", expandprog"));
+      var_stats_expandprogs++;
+    }
 # endif
 #endif
@@ -2962 +2978 @@
 #ifdef CONFIG_WITH_MAKE_STATS
   if (v->changes != 0)
-    printf (_(", %u changes"), v->changes);
+    {
+      printf (_(", %u changes"), v->changes);
+      var_stats_changed++;
+    }
   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_realloced++;
+    }
   var_stats_reallocs += v->reallocs;
-  var_stats_realloced += (v->reallocs != 0);
 
   if (v->references != 0)
-    printf (_(", %u references"), v->references);
+    {
+      printf (_(", %u references"), v->references);
+      var_stats_referenced++;
+    }
   var_stats_references += v->references;
-  var_stats_referenced += (v->references != 0);
 
   var_stats_val_len += v->value_length;
@@ -3034 +3056 @@
     = var_stats_evalvaled = 0;
 #endif
+#ifdef CONFIG_WITH_COMPILER
+  var_stats_expandprogs = var_stats_evalprogs = 0;
+#endif
 #ifdef CONFIG_WITH_MAKE_STATS
   var_stats_changes = var_stats_changed = var_stats_reallocs
@@ -3088 +3113 @@
                var_stats_expands);
 #endif
+#ifdef CONFIG_WITH_COMPILER
+      if (var_stats_expandprogs || var_stats_evalprogs)
+        printf(_("#  eval progs %5lu (%2u%%),     expand progs %6lu (%2u%%)\n"),
+               var_stats_evalprogs,
+               (unsigned int)((100.0 * var_stats_evalprogs) / set->table.ht_fill),
+               var_stats_expandprogs,
+               (unsigned int)((100.0 * var_stats_expandprogs) / set->table.ht_fill));
+#endif
       }