Changeset 1610 in kBuild

Timestamp:

May 8, 2008 3:36:35 AM (17 years ago)

Author:

bird

Message:

Fixed prepend w/ expansion (would append instead of prepend). Optimized append_expanded_string_to_variable().

Location:

trunk/src/kmk

Files:

• expand.c (modified) (1 diff)
• variable.c (modified) (2 diffs)
• variable.h (modified) (3 diffs)

trunk/src/kmk/expand.c

@@ -609 +609 @@
 /* Expands the specified string, appending it to the specified variable value. */
 void
-append_expanded_string_to_variable (struct variable *v, const char *value)
-{
-#if 0 /* This isn't safe because the v->value will become invalid if the
-         variable buffer is reallocated to a new address. Sad but true. */
-  static char const empty_string[] = "";
-  unsigned int original_value_length = v->value_length;
-  char *p;
-
-  /* Switch the variable buffer to the variable value buffer. */
-  char *saved_buffer = variable_buffer;
-  unsigned int saved_buffer_length = variable_buffer_length;
-  variable_buffer = v->value;
-  variable_buffer_length = v->value_alloc_len;
-
-  /* Mark the variable as being expanding. */
-  if (v->value_alloc_len == -42)
-    fatal (*expanding_var, _("var=%s"), v->name);
-  assert (v->value_alloc_len >= 0);
-  v->value_alloc_len = -42;
-
-  /* Skip the current value and start appending a '\0' / space before
-     expanding the string so recursive references are handled correctly.
-     Alternatively, if it's an empty value, replace the value with a fixed
-     empty string. */
-  p = v->value + original_value_length;
-  if (original_value_length)
-    {
-      p = variable_buffer_output (p, " ", 1);
-      p[-1] = '\0';
-    }
+append_expanded_string_to_variable (struct variable *v, const char *value, int append)
+{
+  unsigned int value_len = strlen (value);
+  char *p = (char *) memchr (value, '$', value_len);
+  if (!p)
+    /* fast path */
+    append_string_to_variable (v,value, value_len, append);
   else
-    v->value = (char *)&empty_string[0];
-  p = variable_expand_string (p, value, (long)-1);
-
-  /* Replace the '\0' with the space separator. */
-  if (original_value_length)
-    {
-      assert (variable_buffer[original_value_length] == '\0');
-      variable_buffer[original_value_length] = ' ';
-    }
-  else
-    {
-      assert (v->value == (char *)&empty_string[0]);
-      assert (empty_string[0] == '\0');
-    }
-
-  /* Update the variable. (mind the variable_expand_string() return) */
-  p = strchr (p, '\0');
-  v->value = variable_buffer;
-  v->value_length = p - v->value;
-  v->value_alloc_len = variable_buffer_length;
-
-  /* Restore the variable buffer. */
-  variable_buffer = saved_buffer;
-  variable_buffer_length = saved_buffer_length;
-#else
-  char *p;
-
-  /* Install a fresh variable buffer. */
-  char *saved_buffer;
-  unsigned int saved_buffer_length;
-  install_variable_buffer (&saved_buffer, &saved_buffer_length);
-
-  /* Copy the current value into it and append a space. */
-  p = variable_buffer;
-  if (v->value_length)
-    {
-      p = variable_buffer_output (p, v->value, v->value_length);
-      p = variable_buffer_output (p, " ", 1);
-    }
-
-  /* Append the assignment value. */
-  p = variable_expand_string (p, value, (long)-1);
-  p = strchr (p, '\0');
-
-  /* Replace the variable with the variable buffer. */
-  free (v->value);
-  v->value = variable_buffer;
-  v->value_length = p - v->value;
-  v->value_alloc_len = variable_buffer_length;
-
-  /* Restore the variable buffer, but without freeing the current. */
-  variable_buffer = NULL;
-  restore_variable_buffer (saved_buffer, saved_buffer_length);
-#endif
+    {
+      unsigned int off_dollar = p - (char *)value;
+
+      /* Install a fresh variable buffer. */
+      char *saved_buffer;
+      unsigned int saved_buffer_length;
+      install_variable_buffer (&saved_buffer, &saved_buffer_length);
+
+      p = variable_buffer;
+      if (append || !v->value_length)
+        {
+          /* Copy the current value into it and append a space. */
+          if (v->value_length)
+            {
+              p = variable_buffer_output (p, v->value, v->value_length);
+              p = variable_buffer_output (p, " ", 1);
+            }
+
+          /* Append the assignment value. */
+          p = variable_buffer_output (p, value, off_dollar);
+          p = variable_expand_string (p, value + off_dollar, value_len - off_dollar);
+          p = strchr (p, '\0');
+        }
+      else
+        {
+          /* Expand the assignemnt value. */
+          p = variable_buffer_output (p, value, off_dollar);
+          p = variable_expand_string (p, value + off_dollar, value_len - off_dollar);
+          p = strchr (p, '\0');
+
+          /* Append a space followed by the old value. */
+          p = variable_buffer_output (p, " ", 1);
+          p = variable_buffer_output (p, v->value, v->value_length + 1) - 1;
+        }
+
+      /* Replace the variable with the variable buffer. */
+      free (v->value);
+      v->value = variable_buffer;
+      v->value_length = p - v->value;
+      v->value_alloc_len = variable_buffer_length;
+
+      /* Restore the variable buffer, but without freeing the current. */
+      variable_buffer = NULL;
+      restore_variable_buffer (saved_buffer, saved_buffer_length);
+    }
 }
 #endif /* CONFIG_WITH_VALUE_LENGTH */

trunk/src/kmk/variable.c

@@ -1591 +1591 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
+/* Worker function for do_variable_definition_append() and
+   append_expanded_string_to_variable().
+   The APPEND argument indicates whether it's an append or prepend operation. */
+void append_string_to_variable (struct variable *v, const char *value, unsigned int value_len, int append)
+{
+  /* The previous definition of the variable was recursive.
+     The new value is the unexpanded old and new values. */
+  unsigned int new_value_len = value_len + (v->value_length != 0 ? 1 + v->value_length : 0);
+  int done_1st_prepend_copy = 0;
+
+  /* adjust the size. */
+  if ((unsigned)v->value_alloc_len <= new_value_len + 1)
+    {
+      v->value_alloc_len *= 2;
+      if (v->value_alloc_len < new_value_len + 1)
+          v->value_alloc_len = (new_value_len + 1 + value_len + 0x7f) + ~0x7fU;
+      if (append || !v->value_length)
+        v->value = xrealloc (v->value, v->value_alloc_len);
+      else
+        {
+          /* avoid the extra memcpy the xrealloc may have to do */
+          char *new_buf = xmalloc (v->value_alloc_len);
+          memcpy (&new_buf[value_len + 1], v->value, v->value_length + 1);
+          done_1st_prepend_copy = 1;
+          free (v->value);
+          v->value = new_buf;
+        }
+    }
+
+  /* insert the new bits */
+  if (v->value_length != 0)
+    {
+      if (append)
+        {
+          v->value[v->value_length] = ' ';
+          memcpy (&v->value[v->value_length + 1], value, value_len + 1);
+        }
+      else
+        {
+          if (!done_1st_prepend_copy)
+            memmove (&v->value[value_len + 1], v->value, v->value_length + 1);
+          v->value[value_len] = ' ';
+          memcpy (v->value, value, value_len);
+        }
+    }
+  else
+    memcpy (v->value, value, value_len + 1);
+  v->value_length = new_value_len;
+}
+
 static struct variable *
 do_variable_definition_append (const struct floc *flocp, struct variable *v, const char *value,
@@ -1617 +1667 @@
      This is a heavily exercised code path in kBuild. */
   if (v->recursive)
-    {
-      /* The previous definition of the variable was recursive.
-         The new value is the unexpanded old and new values. */
-      unsigned int value_len = strlen (value);
-      unsigned int new_value_len = value_len + (v->value_length != 0 ? 1 + v->value_length : 0);
-      int done_1st_prepend_copy = 0;
-
-      /* adjust the size. */
-      if ((unsigned)v->value_alloc_len <= new_value_len + 1)
-        {
-          v->value_alloc_len *= 2;
-          if (v->value_alloc_len < new_value_len + 1)
-              v->value_alloc_len = (new_value_len + 1 + value_len + 0x7f) + ~0x7fU;
-          if (append || !v->value_length)
-            v->value = xrealloc (v->value, v->value_alloc_len);
-          else
-            {
-              /* avoid the extra memcpy the xrealloc may have to do */
-              char *new_buf = xmalloc (v->value_alloc_len);
-              memcpy (&new_buf[value_len + 1], v->value, v->value_length + 1);
-              done_1st_prepend_copy = 1;
-              free (v->value);
-              v->value = new_buf;
-            }
-        }
-
-      /* insert the new bits */
-      if (v->value_length != 0)
-        {
-          if (append)
-            {
-              v->value[v->value_length] = ' ';
-              memcpy (&v->value[v->value_length + 1], value, value_len + 1);
-            }
-          else
-            {
-              if (!done_1st_prepend_copy)
-                memmove (&v->value[value_len + 1], v->value, v->value_length + 1);
-              v->value[value_len] = ' ';
-              memcpy (v->value, value, value_len);
-            }
-        }
-      else
-        memcpy (v->value, value, value_len + 1);
-      v->value_length = new_value_len;
-    }
+    append_string_to_variable (v, value, strlen (value), append);
   else
-    {
-      /* The previous definition of the variable was simple.
-         The new value comes from the old value, which was expanded
-         when it was set; and from the expanded new value. */
-      append_expanded_string_to_variable(v, value);
-    }
+    /* The previous definition of the variable was simple.
+       The new value comes from the old value, which was expanded
+       when it was set; and from the expanded new value. */
+    append_expanded_string_to_variable (v, value, append);
 
   /* update the variable */

trunk/src/kmk/variable.h

@@ -89 +89 @@
 #else
       origin ENUM_BITFIELD (3); /* Variable origin.  */
-#endif 
+#endif
     enum variable_export
       {
@@ -143 +143 @@
 void restore_variable_buffer (char *buf, unsigned int len);
 #ifdef CONFIG_WITH_VALUE_LENGTH
-extern void append_expanded_string_to_variable (struct variable *v, const char *value);
+extern void append_expanded_string_to_variable (struct variable *v, const char *value, int append);
 #endif
 
@@ -191 +191 @@
 
 #ifdef CONFIG_WITH_VALUE_LENGTH
+void append_string_to_variable (struct variable *v, const char *value,
+                                unsigned int value_len, int append);
 
 struct variable *define_variable_in_set (const char *name, unsigned int length,