Changeset 1932 for trunk/src/kmk/kbuild.c

Timestamp:

Oct 24, 2008, 10:22:22 PM (17 years ago)

Author:

bird

Message:

kmk: Made struct variable capable of holding read only variables to speed up set_file_variables.

File:

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

trunk/src/kmk/kbuild.c

@@ -572 +572 @@
         unsigned int value_len;
         char *pszExpanded = allocated_variable_expand_2(pVar->value, pVar->value_length, &value_len);
-        free(pVar->value);
+#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+        if (pVar->rdonly_val)
+            pVar->rdonly_val = 0;
+        else
+#endif
+            free(pVar->value);
+        assert (pVar->origin != o_automatic);
         pVar->value = pszExpanded;
         pVar->value_length = value_len;
@@ -643 +649 @@
     struct variable *pVar = kbuild_lookup_variable_n(pszName, cchName);
     if (pVar && pDefPath)
+    {
+        assert(pVar->origin != o_automatic);
+#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+        assert(!pVar->rdonly_val);
+#endif
         kbuild_apply_defpath(pDefPath, &pVar->value, (unsigned int *)&pVar->value_length, &pVar->value_alloc_len, 1);
+    }
     return pVar;
 }
@@ -661 +673 @@
     struct variable *pVar = kbuild_lookup_variable(pszName);
     if (pVar && pDefPath)
+    {
+        assert(pVar->origin != o_automatic);
+#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+        assert(!pVar->rdonly_val);
+#endif
         kbuild_apply_defpath(pDefPath, &pVar->value, (unsigned int *)&pVar->value_length, &pVar->value_alloc_len, 1);
+    }
     return pVar;
 }
@@ -2044 +2062 @@
      */
     if (pDefPath)
+    {
+        /** @todo assert(pSource->origin != o_automatic);  We're changing 'source'
+         *        from the foreach loop!  */
+#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+        assert(!pSource->rdonly_val);
+#endif
         kbuild_apply_defpath(pDefPath, &pSource->value, (unsigned int *)&pSource->value_length, &pSource->value_alloc_len, 1 /* can free */);
+    }
 
     /*