Changeset 1932 for trunk/src/kmk/variable.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/variable.c (modified) (8 diffs)

trunk/src/kmk/variable.c

@@ -254 +254 @@
           else
             assert (value_len == strlen (value));
-          if (!duplicate_value)
+          if (!duplicate_value || duplicate_value == -1)
             {
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+              if (v->value != 0 && !v->rdonly_val)
+                  free (v->value);
+              v->rdonly_val = duplicate_value == -1;
+              v->value = (char *)value;
+              v->value_alloc_len = 0;
+# else
               if (v->value != 0)
                 free (v->value);
               v->value = (char *)value;
               v->value_alloc_len = value_len + 1;
+# endif
             }
           else
@@ -265 +273 @@
               if ((unsigned int)v->value_alloc_len <= value_len)
                 {
-                  free (v->value);
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+                  if (v->rdonly_val)
+                    v->rdonly_val = 0;
+                  else
+# endif
+                    free (v->value);
                   v->value_alloc_len = (value_len + 0x40) & ~0x3f;
                   v->value = xmalloc (v->value_alloc_len);
@@ -272 +285 @@
             }
           v->value_length = value_len;
-#else
+#else  /* !CONFIG_WITH_VALUE_LENGTH */
           if (v->value != 0)
             free (v->value);
           v->value = xstrdup (value);
-#endif
+#endif /* !CONFIG_WITH_VALUE_LENGTH */
           if (flocp != 0)
             v->fileinfo = *flocp;
@@ -307 +320 @@
     assert (value_len == strlen (value));
   v->value_length = value_len;
-  if (!duplicate_value)
-    {
-      v->value_alloc_len = value_len + 1;
+  if (!duplicate_value || duplicate_value == -1)
+    {
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+      v->rdonly_val = duplicate_value == -1;
+      v->value_alloc_len = v->rdonly_val ? 0 : value_len + 1;
+# endif
       v->value = (char *)value;
     }
   else
     {
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+      v->rdonly_val = 0;
+# endif
       v->value_alloc_len = (value_len + 32) & ~31;
       v->value = xmalloc (v->value_alloc_len);
@@ -1345 +1364 @@
   if (*v->value == '\0' || v->origin == o_env || v->origin == o_env_override)
     {
-      free (v->value);
+#ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+      if (v->rdonly_val)
+        v->rdonly_val = 0;
+      else
+#endif
+        free (v->value);
       v->origin = o_file;
       v->value = xstrdup (default_shell);
@@ -1589 +1613 @@
       if ((unsigned)v->value_alloc_len < new_value_len + 1)
           v->value_alloc_len = (new_value_len + 1 + value_len + 0x7f) + ~0x7fU;
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+      if ((append || !v->value_length) && !v->rdonly_val)
+# else
       if (append || !v->value_length)
+# endif
         v->value = xrealloc (v->value, v->value_alloc_len);
       else
@@ -1597 +1625 @@
           memcpy (&new_buf[value_len + 1], v->value, v->value_length + 1);
           done_1st_prepend_copy = 1;
-          free (v->value);
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+          if (v->rdonly_val)
+            v->rdonly_val = 0;
+          else
+# endif
+            free (v->value);
           v->value = new_buf;
         }
@@ -2094 +2127 @@
   v->value_length = eos != NULL ? eos - p : -1;
   assert (eos == NULL || strchr (p, '\0') == eos);
+# ifdef CONFIG_WITH_RDONLY_VARIABLE_VALUE
+  v->rdonly_val = 0;
+# endif
 #endif