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

Timestamp:

Jan 30, 2015, 1:27:51 AM (10 years ago)

Author:

bird

Message:

Started on a make expression and string expansion 'compiler'.

File:

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

trunk/src/kmk/variable.c

@@ -41 +41 @@
 #ifdef CONFIG_WITH_STRCACHE2
 # include <stddef.h>
+#endif
+#ifdef CONFIG_WITH_COMPILER
+# include "kmk_cc_exec.h"
 #endif
 
@@ -383 +386 @@
           v->origin = origin;
           v->recursive = recursive;
-          MAKE_STATS_2(v->changes++);
+         MAKE_STATS_2(v->changes++);
+#ifdef CONFIG_WITH_COMPILER
+         if (v->evalprog || v->expandprog)
+           kmk_cc_variable_changed (v);
+#endif
         }
       return v;
@@ -445 +452 @@
 #endif
   v->export = v_default;
+#ifdef CONFIG_WITH_COMPILER
+  v->evalprog = 0;
+  v->expandprog = 0;
+  v->evalval_count = 0;
+  v->expand_count = 0;
+#else
+  MAKE_STATS_2(v->expand_count = 0);
+  MAKE_STATS_2(v->evalval_count = 0);
+#endif
   MAKE_STATS_2(v->changes = 0);
   MAKE_STATS_2(v->reallocs = 0);
   MAKE_STATS_2(v->references = 0);
-  MAKE_STATS_2(v->cEvalVals = 0);
   MAKE_STATS_2(v->cTicksEvalVal = 0);
 
@@ -589 +604 @@
           free (v->value);
       MAKE_STATS_2(v->changes++);
+#ifdef CONFIG_WITH_COMPILER
+      if (v->evalprog || v->expandprog)
+        kmk_cc_variable_changed (v);
+#endif
     }
   else
@@ -605 +624 @@
       v->aliased = 0;
       v->export = v_default;
+#ifdef CONFIG_WITH_COMPILER
+      v->evalprog = 0;
+      v->expandprog = 0;
+      v->evalval_count = 0;
+      v->expand_count = 0;
+#else
+      MAKE_STATS_2(v->expand_count = 0);
+      MAKE_STATS_2(v->evalval_count = 0);
+#endif
       MAKE_STATS_2(v->changes = 0);
       MAKE_STATS_2(v->reallocs = 0);
       MAKE_STATS_2(v->references = 0);
-      MAKE_STATS_2(v->cEvalVals = 0);
       MAKE_STATS_2(v->cTicksEvalVal = 0);
       v->exportable = 1;
@@ -1242 +1269 @@
 #ifndef CONFIG_WITH_STRCACHE2
   free (v->name);
+#endif
+#ifdef CONFIG_WITH_COMPILER
+  if (v->evalprog || v->expandprog)
+    kmk_cc_variable_deleted (v);
 #endif
 #ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
@@ -1362 +1393 @@
             if (from_var->alias)
               fatal(NULL, ("Attempting to delete variable aliased '%s'"), from_var->name);
+#endif
+#ifdef CONFIG_WITH_COMPILER
+            if (from_var->evalprog || from_var->expandprog)
+              kmk_cc_variable_deleted (from_var);
 #endif
 #ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
@@ -2335 +2370 @@
                free (free_value);
             MAKE_STATS_2(v->changes++);
+# ifdef CONFIG_WITH_COMPILER
+            if (v->evalprog || v->expandprog)
+              kmk_cc_variable_changed (v);
+# endif
             return v;
 #else /* !CONFIG_WITH_VALUE_LENGTH */
@@ -2765 +2804 @@
 
 
+#if defined (CONFIG_WITH_COMPILER) || defined (CONFIG_WITH_MAKE_STATS)
+static unsigned long var_stats_evalvals, var_stats_evalvaled;
+static unsigned long var_stats_expands, var_stats_expanded;
+#endif
 #ifdef CONFIG_WITH_MAKE_STATS
 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_evalvals, var_stats_evalvaled;
-static uintmax_t var_stats_evalval_ticks;
 static unsigned long var_stats_val_len, var_stats_val_alloc_len;
 static unsigned long var_stats_val_rdonly_len;
@@ -2838 +2879 @@
 #endif /* KMK */
 
+#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);
+# else
+    printf (_(", %u evalvals"), v->evalval_count);
+# endif
+  var_stats_evalvals += v->evalval_count;
+  var_stats_evalvaled += (v->evalval_count != 0);
+
+  if (v->expand_count != 0)
+    printf (_(", %u expands"), v->expand_count);
+  var_stats_expands += v->expand_count;
+  var_stats_expanded += (v->expand_count != 0);
+# ifdef CONFIG_WITH_COMPILER
+  if (v->evalprog != 0)
+    printf (_(", evalprog"));
+  if (v->expandprog != 0)
+    printf (_(", expandprog"));
+# endif
+#endif
+
 #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);
 
   if (v->references != 0)
-      printf (_(", %u references"), v->references);
+    printf (_(", %u references"), v->references);
   var_stats_references += v->references;
   var_stats_referenced += (v->references != 0);
-
-  if (v->cEvalVals != 0)
-      //printf (_(", %u evalvals (%llu ticks)"), v->cEvalVals, v->cTicksEvalVal);
-      printf (_(", %u evalvals (%llu ms)"), v->cEvalVals, v->cTicksEvalVal / 3299998);
-  var_stats_evalvals += v->cEvalVals;
-  var_stats_evalvaled += (v->cEvalVals != 0);
 
   var_stats_val_len += v->value_length;
@@ -2914 +2971 @@
 print_variable_set (struct variable_set *set, char *prefix)
 {
+#if defined (CONFIG_WITH_COMPILER) || defined (CONFIG_WITH_MAKE_STATS)
+  var_stats_expands = var_stats_expanded = var_stats_evalvals
+    = var_stats_evalvaled = 0;
+#endif
 #ifdef CONFIG_WITH_MAKE_STATS
   var_stats_changes = var_stats_changed = var_stats_reallocs
@@ -2919 +2980 @@
     = var_stats_val_len = var_stats_val_alloc_len
     = var_stats_val_rdonly_len = 0;
+#endif
 
   hash_map_arg (&set->table, print_variable, prefix);
@@ -2924 +2986 @@
   if (set->table.ht_fill)
     {
+#ifdef CONFIG_WITH_MAKE_STATS
       unsigned long fragmentation;
 
@@ -2953 +3016 @@
                (unsigned int)((100.0 * var_stats_referenced) / set->table.ht_fill),
                var_stats_references);
+#endif
+#if defined (CONFIG_WITH_COMPILER) || defined (CONFIG_WITH_MAKE_STATS)
+      if (var_stats_evalvals)
+        printf(_("#   evalvaled %5lu (%2u%%),    evalval calls %6lu\n"),
+               var_stats_evalvaled,
+               (unsigned int)((100.0 * var_stats_evalvaled) / set->table.ht_fill),
+               var_stats_evalvals);
+      if (var_stats_expands)
+        printf(_("#    expanded %5lu (%2u%%),          expands %6lu\n"),
+               var_stats_expanded,
+               (unsigned int)((100.0 * var_stats_expanded) / set->table.ht_fill),
+               var_stats_expands);
+#endif
       }
-#else
-  hash_map_arg (&set->table, print_variable, prefix);
-#endif
 
   fputs (_("# variable set hash-table stats:\n"), stdout);