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

Timestamp:

Oct 20, 2008, 1:50:58 AM (17 years ago)

Author:

bird

Message:

kmk: Save pointers to global variables together with the string in the string cache.

File:

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

trunk/src/kmk/variable.c

@@ -223 +223 @@
 #ifndef CONFIG_WITH_STRCACHE2
   var_key.name = (char *) name;
-#else
-  var_key.name = name = strcache2_add (&variable_strcache, name, length);
-#endif
   var_key.length = length;
   var_slot = (struct variable **) hash_find_slot (&set->table, &var_key);
@@ -233 +230 @@
 
   v = *var_slot;
+#else  /* CONFIG_WITH_STRCACHE2 */
+  var_key.name = name = strcache2_add (&variable_strcache, name, length);
+  var_key.length = length;
+  if (   set != &global_variable_set
+      || !(v = strcache2_get_user_val (&variable_strcache, var_key.name)))
+    {
+      var_slot = (struct variable **) hash_find_slot (&set->table, &var_key);
+      v = *var_slot;
+    }
+  else
+    assert (!v || (v->name == name && !HASH_VACANT (v)));
+#endif /* CONFIG_WITH_STRCACHE2 */
   if (! HASH_VACANT (v))
     {
@@ -345 +354 @@
     }
 
+#ifdef CONFIG_WITH_STRCACHE2
+  /* If it's the global set, remember the variable. */
+  if (set == &global_variable_set)
+    strcache2_set_user_val (&variable_strcache, v->name, v);
+#endif
   return v;
 }
@@ -465 +479 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef CONFIG_WITH_STRCACHE2
-  var_key.value = (char *)&var_key; /* hack: name not cached */
-#endif
 
   for (setlist = current_variable_set_list;
@@ -589 +600 @@
 
   /* lookup the name in the string case, if it's not there it won't
-     be in any of the sets either. */
+     be in any of the sets either.  Optimize lookups in the global set. */
   cached_name = strcache2_lookup(&variable_strcache, name, length);
   if (!cached_name)
     return NULL;
+
+  if (set == &global_variable_set)
+    {
+      struct variable *v;
+      v = strcache2_get_user_val (&variable_strcache, cached_name);
+      assert (!v || v->name == cached_name);
+      return v;
+    }
+
   name = cached_name;
 #endif /* CONFIG_WITH_STRCACHE2 */
@@ -598 +618 @@
   var_key.name = (char *) name;
   var_key.length = length;
-#ifdef CONFIG_WITH_STRCACHE2
-  var_key.value = (char *)&var_key; /* hack: name not cached */
-#endif
 
   return (struct variable *) hash_find_item ((struct hash_table *) &set->table, &var_key);