Changeset 1848 for trunk/src/kmk

Timestamp:

Oct 12, 2008, 6:41:07 PM (17 years ago)

Author:

bird

Message:

kmk: includedep dependencies does not require unescaping or any other parsing in expand_deps. This saves more than 10% in a typical kBuild testcase.

Location:

trunk/src/kmk

Files:

• dep.h (modified) (1 diff)
• file.c (modified) (3 diffs)
• incdep.c (modified) (1 diff)

trunk/src/kmk/dep.h

@@ -44 +44 @@
     unsigned int staticpattern : 1;
     unsigned int need_2nd_expansion : 1;
+#ifdef CONFIG_WITH_INCLUDEDEP
+    unsigned int includedep : 1;
+#endif
   };
 

trunk/src/kmk/file.c

@@ -514 +514 @@
         continue;
 
+#ifdef CONFIG_WITH_INCLUDEDEP
+      /* Dependencies loaded by includedep can be passed right thru. */
+      if (d->includedep)
+        {
+          new = alloc_dep();
+          new->name = d->name;
+        }
+      else
+        {
+#endif
+
       /* Create the dependency list.
          If we're not doing 2nd expansion, then it's just the name.  We will
@@ -574 +585 @@
 
       /* Parse the prerequisites.  */
-#ifndef CONFIG_WITH_VALUE_LENGTH
       new = parse_prereqs (p);
-#else
-      /** @todo make use of len here! */
-      new = parse_prereqs (p);
-#endif
 
       /* If this dep list was from a static pattern rule, expand the %s.  We
@@ -647 +653 @@
             }
         }
+
+#ifdef CONFIG_WITH_INCLUDEDEP
+        }
+#endif
 
       /* Enter them as files. */

trunk/src/kmk/incdep.c

@@ -1255 +1255 @@
                   *nextdep = dep = alloc_dep ();
                   dep->name = incdep_record_strcache (curdep, cur, endp - cur);
+                  dep->includedep = 1;
                   nextdep = &dep->next;