Changeset 1929 in kBuild

Timestamp:

Oct 24, 2008 6:17:28 AM (16 years ago)

Author:

bird

Message:

kmk/read.c: more free() avoidance, this time some very small buffers for conditionals. Use static buffers for the first chunk, this avoids all alloc/free for a typical kBuild run. the cost is 16 bytes of stack per recursion.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (1 diff)
• read.c (modified) (6 diffs)

trunk/src/kmk/expand.c

@@ -1008 +1008 @@
   variable_buffer = 0;
 
-  assert (v->length == strlen (v->name));
+  assert ((unsigned int)v->length == strlen (v->name));
   val = variable_append (v->name, strlen (v->name), current_variable_set_list);
   variable_buffer_output (val, "", 1);

trunk/src/kmk/read.c

@@ -86 +86 @@
                                    2=already interpreted */
     char *seen_else;            /* Have we already seen an `else'?  */
+#ifdef KMK
+    char ignoring_first[8];
+    char seen_else_first[8];
+#endif
   };
 
+#ifdef KMK
+static struct conditionals toplevel_conditionals =
+{
+    0,
+    sizeof (toplevel_conditionals.ignoring_first),
+    &toplevel_conditionals.ignoring_first[0],
+    &toplevel_conditionals.seen_else_first[0],
+    "", ""
+};
+#else /* !KMK */
 static struct conditionals toplevel_conditionals;
+#endif /* !KMK */
 static struct conditionals *conditionals = &toplevel_conditionals;
 
@@ -331 +346 @@
   struct conditionals *save = conditionals;
 
+#ifndef KMK
   memset (new, '\0', sizeof (*new));
+#else  /* KMK */
+  new->if_cmds   = 0;
+  new->allocated = sizeof (new->ignoring_first);
+  new->ignoring  = new->ignoring_first;
+  new->seen_else = new->seen_else_first;
+#endif /* KMK */
   conditionals = new;
 
@@ -343 +365 @@
 {
   /* Free any space allocated by conditional_line.  */
-  if (conditionals->ignoring)
-    free (conditionals->ignoring);
-  if (conditionals->seen_else)
-    free (conditionals->seen_else);
+#ifdef KMK
+  if (conditionals->allocated > sizeof (conditionals->ignoring_first))
+#endif
+    {
+      if (conditionals->ignoring)
+        free (conditionals->ignoring);
+      if (conditionals->seen_else)
+        free (conditionals->seen_else);
+    }
 
   /* Restore state.  */
@@ -1925 +1952 @@
     }
 
+#ifndef KMK
   if (conditionals->allocated == 0)
     {
@@ -1931 +1959 @@
       conditionals->seen_else = xmalloc (conditionals->allocated);
     }
+#endif
 
   o = conditionals->if_cmds++;
   if (conditionals->if_cmds > conditionals->allocated)
     {
-      conditionals->allocated += 5;
-      conditionals->ignoring = xrealloc (conditionals->ignoring,
-                                         conditionals->allocated);
-      conditionals->seen_else = xrealloc (conditionals->seen_else,
-                                          conditionals->allocated);
+#ifdef KMK
+#if 0
+      if (conditionals->allocated == 0)
+        {
+          conditionals->allocated = sizeof (conditionals->ignoring_first);
+          conditionals->ignoring  = conditionals->ignoring_first;
+          conditionals->seen_else = conditionals->seen_else_first;
+        }
+      else
+#endif
+      if (conditionals->allocated <= sizeof (conditionals->ignoring_first))
+        {
+          assert (conditionals->allocated == sizeof (conditionals->ignoring_first));
+          conditionals->allocated += 16;
+          conditionals->ignoring = xmalloc (conditionals->allocated);
+          memcpy (conditionals->ignoring, conditionals->ignoring_first,
+                  sizeof (conditionals->ignoring_first));
+          conditionals->seen_else = xmalloc (conditionals->allocated);
+          memcpy (conditionals->seen_else, conditionals->seen_else_first,
+                  sizeof (conditionals->seen_else_first));
+        }
+      else
+        {
+          conditionals->allocated *= 2;
+#else  /* !KMK */
+          conditionals->allocated += 5;
+#endif /* !KMK */
+          conditionals->ignoring = xrealloc (conditionals->ignoring,
+                                             conditionals->allocated);
+          conditionals->seen_else = xrealloc (conditionals->seen_else,
+                                              conditionals->allocated);
+#ifdef KMK
+        }
+#endif
     }
 
@@ -2916 +2974 @@
   const char *p = *string;
   char *new = 0;
-  int slen;
+  int slen = 0;
 
   /* If the first char is a % return now.  This lets us avoid extra tests