Changeset 1857 for trunk/src/kmk/remake.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/remake.c (modified) (15 diffs)

trunk/src/kmk/remake.c

@@ -386 +386 @@
   if (file->multi_head != NULL && file->multi_head != file)
     {
-      DBS (DB_VERBOSE, (_("Considering target file `%s' -> multi head `%s'.\n"), 
+      DBS (DB_VERBOSE, (_("Considering target file `%s' -> multi head `%s'.\n"),
                           file->name, file->multi_head->name));
       file = file->multi_head;
@@ -505 +505 @@
 
   /* Update all non-intermediate files we depend on, if necessary,
-     and see whether any of them is more recent than this file.  
+     and see whether any of them is more recent than this file.
      For explicit multitarget rules we must iterate all the output
      files to get the correct picture. */
@@ -523 +523 @@
           int maybe_make;
           int dontcare = 0;
-    
+
           check_renamed (d->file);
-    
+
           mtime = file_mtime (d->file);
           check_renamed (d->file);
-    
+
           if (is_updating (d->file))
             {
@@ -561 +561 @@
               continue;
             }
-    
+
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
           d->file->parent = f2;
@@ -568 +568 @@
 #endif
           maybe_make = must_make;
-    
+
           /* Inherit dontcare flag from our parent. */
           if (rebuilding_makefiles)
@@ -575 +575 @@
               d->file->dontcare = file->dontcare;
             }
-    
-    
+
+
           dep_status |= check_dep (d->file, depth, this_mtime, &maybe_make);
-    
+
           /* Restore original dontcare flag. */
           if (rebuilding_makefiles)
             d->file->dontcare = dontcare;
-    
+
           if (! d->ignore_mtime)
             must_make = maybe_make;
-    
+
           check_renamed (d->file);
-    
+
           {
             register struct file *f = d->file;
@@ -600 +600 @@
             while (f != 0);
           }
-    
+
           if (dep_status != 0 && !keep_going_flag)
             break;
-    
+
           if (!running)
             /* The prereq is considered changed if the timestamp has changed while
@@ -609 +609 @@
             d->changed = ((file_mtime (d->file) != mtime)
                           || (mtime == NONEXISTENT_MTIME));
-    
+
           lastd = d;
           d = d->next;
@@ -633 +633 @@
             {
               int dontcare = 0;
-   
+
               FILE_TIMESTAMP mtime = file_mtime (d->file);
               check_renamed (d->file);
@@ -641 +641 @@
               d->file->parent = file;
 #endif
-   
+
               /* Inherit dontcare flag from our parent. */
               if (rebuilding_makefiles)
@@ -648 +648 @@
                   d->file->dontcare = file->dontcare;
                 }
-   
-   
+
+
               dep_status |= update_file (d->file, depth);
-   
+
               /* Restore original dontcare flag. */
               if (rebuilding_makefiles)
                 d->file->dontcare = dontcare;
-   
+
               check_renamed (d->file);
-                  
+
               {
                 register struct file *f = d->file;
@@ -670 +670 @@
                 while (f != 0);
               }
-   
+
               if (dep_status != 0 && !keep_going_flag)
                 break;
-   
+
               if (!running)
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
@@ -741 +741 @@
 #endif
         check_renamed (d->file);
-  
+
         if (! d->ignore_mtime)
           {
@@ -753 +753 @@
               must_make = 1;
 #endif
-  
+
             /* Set DEPS_CHANGED if this dep actually changed.  */
             deps_changed |= d->changed;
           }
-  
+
         /* Set D->changed if either this dep actually changed,
            or its dependent, FILE, is older or does not exist.  */
         d->changed |= noexist || d_mtime > this_mtime;
-  
+
         if (!noexist && ISDB (DB_BASIC|DB_VERBOSE))
           {
             const char *fmt = 0;
-  
+
             if (d->ignore_mtime)
               {
@@ -783 +783 @@
             else if (ISDB (DB_VERBOSE))
               fmt = _("Prerequisite `%s' is older than target `%s'.\n");
-  
+
             if (fmt)
               {