Changeset 1847 for trunk/src/kmk

Timestamp:

Oct 12, 2008, 6:25:03 PM (17 years ago)

Author:

bird

Message:

kmk: Some optimizations for expand_deps.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (2 diffs)
• file.c (modified) (5 diffs)
• function.c (modified) (1 diff)
• variable.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -753 +753 @@
 expand_argument (const char *str, const char *end)
 {
+#ifndef CONFIG_WITH_VALUE_LENGTH /** @todo the hacks are no longer required. Clean up !! */
   char *tmp;
+#endif
 
   if (str == end)
@@ -823 +825 @@
 
    Differs from variable_expand_for_file in that it takes a pointer to
-   where in the variable buffer to start outputting the expanded string.  */
+   where in the variable buffer to start outputting the expanded string,
+   and that it can returned the length of the string if you wish.  */
 
 char *
-variable_expand_for_file_2 (char *o, const char *line, struct file *file)
+variable_expand_for_file_2 (char *o, const char *line, unsigned int length,
+                            struct file *file, unsigned int *value_lenp)
 {
   char *result;
   struct variable_set_list *save;
   const struct floc *reading_file_saved;
+  long len = length == ~0U ? (long)-1 : (long)length;
   char *eol;
 
+  if (!o)
+    o = initialize_variable_output();
+
   if (file == 0)
-    return variable_expand_string_2 (o, line, (long)-1, &eol);
-
-  save = current_variable_set_list;
-  current_variable_set_list = file->variables;
-  reading_file_saved = reading_file;
-  if (file->cmds && file->cmds->fileinfo.filenm)
-    reading_file = &file->cmds->fileinfo;
+     result = variable_expand_string_2 (o, line, len, &eol);
   else
-    reading_file = 0;
-  result = variable_expand_string_2 (o, line, (long)-1, &eol);
-  current_variable_set_list = save;
-  reading_file = reading_file_saved;
+    {
+      save = current_variable_set_list;
+      current_variable_set_list = file->variables;
+      reading_file_saved = reading_file;
+      if (file->cmds && file->cmds->fileinfo.filenm)
+        reading_file = &file->cmds->fileinfo;
+      else
+        reading_file = 0;
+      result = variable_expand_string_2 (o, line, len, &eol);
+      current_variable_set_list = save;
+      reading_file = reading_file_saved;
+    }
+
+  if (value_lenp)
+    *value_lenp = eol - result;
 
   return result;

trunk/src/kmk/file.c

@@ -507 +507 @@
       struct dep *new, *d1;
       char *p;
+#ifdef CONFIG_WITH_VALUE_LENGTH
+      unsigned int len;
+#endif
 
       if (! d->name)
@@ -518 +521 @@
           p = variable_expand ("");
           buffer_offset = p - variable_buffer;
+#ifndef CONFIG_WITH_VALUE_LENGTH
           variable_buffer_output (p, d->name, strlen (d->name) + 1);
+#else
+          len = strcache_get_len (d->name);
+          variable_buffer_output (p, d->name, len + 1);
+#endif
           p = variable_buffer + buffer_offset; /* bird - variable_buffer may have been reallocated. (observed it) */
         }
@@ -554 +562 @@
           set_file_variables (f);
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
           p = variable_expand_for_file (d->name, f);
+#else
+          len = strcache_get_len (d->name);
+          p = variable_expand_for_file_2 (NULL, d->name, len, f, &len);
+#endif
 
           if (d->stem != 0)
@@ -561 +574 @@
 
       /* 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
@@ -576 +594 @@
             {
               char *percent;
+#ifndef KMK
               int nl = strlen (dp->name) + 1;
               char *nm = alloca (nl);
               memcpy (nm, dp->name, nl);
               percent = find_percent (nm);
+#else  /* KMK - don't make a stack copy unless it's actually required! */
+              unsigned int nl = strcache_get_len (dp->name);
+              char *nm;
+              percent = memchr (nm, '%', nl);
+              if (percent)
+                {
+                  nm = alloca (nl + 1);
+                  memcpy (nm, dp->name, nl + 1);
+                  percent = find_percent (nm);
+                }
+#endif /* KMK */
               if (percent)
                 {

trunk/src/kmk/function.c

@@ -3942 +3942 @@
           if (i)
             o = variable_buffer_output (o, cmd_sep, cmd_sep_len);
-          o = variable_expand_for_file_2 (o, cmds->command_lines[i], file);
+          o = variable_expand_for_file_2 (o, cmds->command_lines[i], ~0U, file, NULL);
 
           /* Skip it if it has a '%' prefix or is blank. */

trunk/src/kmk/variable.h

@@ -182 +182 @@
 char *variable_expand_for_file (const char *line, struct file *file);
 #ifdef CONFIG_WITH_COMMANDS_FUNC
-char *variable_expand_for_file_2 (char *o, const char *line, struct file *file);
+char *variable_expand_for_file_2 (char *o, const char *line, unsigned int lenght,
+                                  struct file *file, unsigned int *value_lenp);
 #endif
 char *allocated_variable_expand_for_file (const char *line, struct file *file);