Changeset 1857 for trunk/src/kmk/read.c

Timestamp:

Oct 13, 2008, 5:58:07 AM (17 years ago)

Author:

bird

Message:

kmk: improved the hashing of file table entries by making the strcache cache their hash values along with the string length.

File:

• trunk/src/kmk/read.c (modified) (4 diffs)

trunk/src/kmk/read.c

@@ -418 +418 @@
   deps->next = read_makefiles;
   read_makefiles = deps;
+#ifndef KMK
   deps->file = lookup_file (filename);
+#else
+  deps->file = lookup_file_cached (filename);
+#endif
   if (deps->file == 0)
     deps->file = enter_file (filename);
@@ -2302 +2306 @@
              new entry if the file is a double-colon, which we don't want in
              this situation.  */
+#ifndef KMK
           f = lookup_file (name);
           if (!f)
             f = enter_file (strcache_add (name));
+#else  /* KMK */
+           /* XXX: this is probably already a cached string. */
+          fname = strcache_add (name);
+          f = lookup_file_cached (fname);
+          if (!f)
+            f = enter_file (fname);
+#endif
           else if (f->double_colon)
             f = f->double_colon;
@@ -2645 +2657 @@
         {
           /* Double-colon.  Make a new record even if there already is one.  */
+#ifndef KMK
           f = lookup_file (name);
+#else  /* KMK - the name is already in the cache, don't waste time.  */
+          f = lookup_file_cached (name);
+#endif
 
           /* Check for both : and :: rules.  Check is_target so
@@ -2652 +2668 @@
             fatal (flocp,
                    _("target file `%s' has both : and :: entries"), f->name);
+#ifndef KMK
           f = enter_file (strcache_add (name));
+#else  /* KMK - the name is already in the cache, don't waste time.  */
+          f = enter_file (name);
+#endif
           /* If there was an existing entry and it was a double-colon entry,
              enter_file will have returned a new one, making it the prev