Changeset 1877 in kBuild for trunk/src/kmk

Timestamp:

Oct 17, 2008 1:29:35 AM (16 years ago)

Author:

bird

Message:

kmk: cache variable name strings.

Location:

trunk/src/kmk

Files:

• variable.c (modified) (6 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/variable.c

@@ -603 +603 @@
   = { 0, &global_variable_set };
 struct variable_set_list *current_variable_set_list = &global_setlist;
+#ifdef CONFIG_WITH_STRCACHE2
+static struct strcache2 variable_strcache;
+#endif
 
 
@@ -612 +615 @@
   hash_init (&global_variable_set.table, VARIABLE_BUCKETS,
              variable_hash_1, variable_hash_2, variable_hash_cmp);
+#ifdef CONFIG_WITH_STRCACHE2
+  strcache2_init (&variable_strcache, "variable", 65536, 0, 0, 0);
+#endif
 }
 
@@ -712 +718 @@
   v = alloccache_alloc (&variable_cache);
 #endif
+#ifndef CONFIG_WITH_STRCACHE2
   v->name = savestring (name, length);
+#else
+  v->name = strcache2_add (&variable_strcache, name, length);
+#endif
   v->length = length;
 #ifdef VARIABLE_HASH /* bird */
@@ -1157 +1167 @@
 {
   struct variable *v = (struct variable *) item;
+#ifndef CONFIG_WITH_STRCACHE2
   free (v->name);
+#endif
   free (v->value);
 }
@@ -1695 +1707 @@
                 struct variable *gv;
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
                 gv = lookup_variable_in_set (v->name, strlen(v->name),
                                              &global_variable_set);
+#else
+                assert ((int)strlen(v->name) == v->length);
+                gv = lookup_variable_in_set (v->name, v->length,
+                                                     &global_variable_set);
+#endif
                 if (gv)
                   v->export = gv->export;
@@ -2516 +2534 @@
       printf (_("\n# %u pattern-specific variable values"), rules);
   }
+
+#ifdef CONFIG_WITH_STRCACHE2
+  strcache2_print_stats (&variable_strcache, "# ");
+#endif
 }
 

trunk/src/kmk/variable.h

@@ -57 +57 @@
 struct variable
   {
+#ifndef CONFIG_WITH_STRCACHE2
     char *name;                 /* Variable name.  */
+#else
+    const char *name;           /* Variable name.  */
+#endif
     int length;                 /* strlen (name) */
 #ifdef VARIABLE_HASH /* bird */