Changeset 1107

Timestamp:

Sep 23, 2007, 7:29:00 AM (18 years ago)

Author:

bird

Message:

some silly realloc optimizations.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (2 diffs)
• variable.c (modified) (2 diffs)

trunk/src/kmk/expand.c

@@ -63 +63 @@
     {
       unsigned int offset = ptr - variable_buffer;
+#ifdef KMK
+      variable_buffer_length = variable_buffer_length <= 1024
+                             ? 2048 : variable_buffer_length * 4;
+      if (variable_buffer_length < newlen + 100)
+          variable_buffer_length = (newlen + 100 + 1023) & ~1023U;
+#else
       variable_buffer_length = (newlen + 100 > 2 * variable_buffer_length
-                                ? newlen + 100
-                                : 2 * variable_buffer_length);
+                               ? newlen + 100
+                               : 2 * variable_buffer_length);
+#endif
       variable_buffer = xrealloc (variable_buffer, variable_buffer_length);
       ptr = variable_buffer + offset;
@@ -83 +90 @@
   if (variable_buffer == 0)
     {
+#ifdef KMK
+      variable_buffer_length = 384;
+#else
       variable_buffer_length = 200;
+#endif
       variable_buffer = xmalloc (variable_buffer_length);
       variable_buffer[0] = '\0';

trunk/src/kmk/variable.c

@@ -1394 +1394 @@
 
   /* The juicy bits, append the specified value to the variable
-     This is a heavily exercied code path in kBuild. */
+     This is a heavily exercised code path in kBuild. */
   if (v->recursive)
     {
@@ -1406 +1406 @@
       if ((unsigned)v->value_alloc_len <= new_value_len)
         {
-          /* XXX: anticipating further appends/prepends. */
-          if (value_len > v->value_alloc_len)
-            v->value_alloc_len = (new_value_len + 0x80) + 0x7f;
-          else
-            v->value_alloc_len = (new_value_len + value_len + 0x80) + 0x7f;
+          v->value_alloc_len *= 2;
+          if (v->value_alloc_len < new_value_len)
+              v->value_alloc_len = (new_value_len + value_len + 0x7f) + ~0x7fU;
           if (append || !v->value_length)
             v->value = xrealloc (v->value, v->value_alloc_len);