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

Timestamp:

Oct 22, 2008, 11:59:51 PM (17 years ago)

Author:

bird

Message:

kmk: CONFIG_WITH_MINIMAL_STATS vs. CONFIG_WITH_MAKE_STATS - require special builds for expensive statistics.

File:

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

trunk/src/kmk/variable.c

@@ -33 +33 @@
 #ifdef KMK
 # include "kbuild.h"
+#endif
+#ifdef CONFIG_WITH_STRCACHE2
+# include <stddef.h>
 #endif
 
@@ -229 +232 @@
     }
   else
-    assert (!v || (v->name == name && !HASH_VACANT (v)));
+    {
+      assert (!v || (v->name == name && !HASH_VACANT (v)));
+      var_slot = 0;
+    }
 #endif /* CONFIG_WITH_STRCACHE2 */
   if (! HASH_VACANT (v))
@@ -466 +472 @@
   hash_1 = strcache2_calc_ptr_hash (&variable_strcache, name);
   ht = &setlist->set->table;
+  MAKE_STATS (ht->ht_lookups++);
   idx = hash_1 & (ht->ht_size - 1);
   v = ht->ht_vec[idx];
@@ -481 +488 @@
           idx &= (ht->ht_size - 1);
           v = (struct variable *) ht->ht_vec[idx];
-          ht->ht_collisions++; /* there are hardly any deletions, so don't bother with not counting deleted clashes. */
+          MAKE_STATS (ht->ht_collisions++); /* there are hardly any deletions, so don't bother with not counting deleted clashes. */
 
           if (v == 0)
@@ -510 +517 @@
       /* first iteration unrolled */
       ht = &setlist->set->table;
+      MAKE_STATS (ht->ht_lookups++);
       idx = hash_1 & (ht->ht_size - 1);
       v = ht->ht_vec[idx];
@@ -524 +532 @@
               idx &= (ht->ht_size - 1);
               v = (struct variable *) ht->ht_vec[idx];
-              ht->ht_collisions++; /* see reason above */
+              MAKE_STATS (ht->ht_collisions++); /* see reason above */
 
               if (v == 0)
@@ -1158 +1166 @@
   && defined (CONFIG_WITH_WHICH) \
   && defined (CONFIG_WITH_EVALPLUS) \
-  && defined (CONFIG_WITH_MAKE_STATS) \
+  && (defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)) \
   && defined (CONFIG_WITH_COMMANDS_FUNC) \
   && defined (KMK_HELPERS)
@@ -1234 +1242 @@
   strcat (buf, " evalctx evalval evalvalctx evalcall evalcall2");
 #  endif
-#  if defined (CONFIG_WITH_MAKE_STATS)
+#  if defined (CONFIG_WITH_MAKE_STATS) || defined (CONFIG_WITH_MINIMAL_STATS)
   strcat (buf, " make-stats");
 #  endif