Changeset 1931 for trunk/src

Timestamp:

Oct 24, 2008, 9:02:48 PM (17 years ago)

Author:

bird

Message:

kmk: recycle more allocate_variable_expand_* results.

Location:

trunk/src/kmk

Files:

• expand.c (modified) (5 diffs)
• read.c (modified) (10 diffs)
• variable.h (modified) (1 diff)

trunk/src/kmk/expand.c

@@ -60 +60 @@
 };
 struct recycled_buffer *recycled_head;
-static char *
-allocated_variable_expand_3 (const char *line, unsigned int length,
-                             unsigned int *value_lenp,
-                             unsigned int *buffer_lengthp);
-static void
-recycle_variable_buffer (char *buffer, unsigned int length);
-
-#endif
+#endif /* CONFIG_WITH_VALUE_LENGTH */
 
 
@@ -1071 +1064 @@
 }
 
-/* Handles a special case for variable_expand_string2 where the variable
-   name is expanded.  This variant allows the variable_buffer to
-   be recycled and thus avoid bothering with a slow free implementation
-   (darwin is horrible here).  */
-
-static char *
+/* Initially created for handling a special case for variable_expand_string2
+   where the variable name is expanded and freed right afterwards.  This
+   variant allows the variable_buffer to be recycled and thus avoid bothering
+   with a slow free implementation. (Darwin is horrible slow.)  */
+
+char *
 allocated_variable_expand_3 (const char *line, unsigned int length,
                              unsigned int *value_lenp,
@@ -1090 +1083 @@
 
   value = variable_expand_string_2 (NULL, line, len, &eol);
-  *value_lenp = eol - value;
+  if (value_lenp)
+    *value_lenp = eol - value;
   *buffer_lengthp = variable_buffer_length;
 
@@ -1100 +1094 @@
 
 /* recycle a buffer. */
-static void
+
+void
 recycle_variable_buffer (char *buffer, unsigned int length)
 {
@@ -1133 +1128 @@
 restore_variable_buffer (char *buf, unsigned int len)
 {
+#ifndef CONFIG_WITH_VALUE_LENGTH
   free (variable_buffer);
+#else
+  if (variable_buffer)
+    recycle_variable_buffer (variable_buffer, variable_buffer_length);
+#endif
 
   variable_buffer = buf;

trunk/src/kmk/read.c

@@ -905 +905 @@
                   cp = ap = allocated_variable_expand (p2);
 #else
-                  cp = ap = allocated_variable_expand_2 (p2, eol - p2, NULL);
+                  unsigned int buf_len;
+                  cp = ap = allocated_variable_expand_3 (p2, eol - p2, NULL, &buf_len);
 #endif
 
@@ -917 +918 @@
                     }
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
                   free (ap);
+#else
+                  recycle_variable_buffer (ap, buf_len);
+#endif
                 }
             }
@@ -939 +944 @@
               cp = ap = allocated_variable_expand (p2);
 #else
-              cp = ap = allocated_variable_expand_2 (p2, eol - p2, NULL);
+              unsigned int buf_len;
+              cp = ap = allocated_variable_expand_3 (p2, eol - p2, NULL, &buf_len);
 #endif
 
@@ -952 +958 @@
                 }
 
+#ifndef CONFIG_WITH_VALUE_LENGTH
               free (ap);
+#else
+              recycle_variable_buffer (ap, buf_len);
+#endif
             }
           goto rule_complete;
@@ -995 +1005 @@
                             ? incdep_queue : incdep_flush;
           char *free_me = NULL;
+          unsigned int buf_len;
           char *name = p2;
 
@@ -1000 +1011 @@
             {
               unsigned int name_len;
-              free_me = name = allocated_variable_expand_2 (name, eol - name, &name_len);
+              free_me = name = allocated_variable_expand_3 (name, eol - name, &name_len, &buf_len);
               eol = name + name_len;
               while (isspace ((unsigned char)*name))
@@ -1013 +1024 @@
 
           if (free_me)
-            free (free_me);
+            recycle_variable_buffer (free_me, buf_len);
           goto rule_complete;
         }
@@ -1032 +1043 @@
           p = allocated_variable_expand (p2);
 #else
-          p = allocated_variable_expand_2 (p2, eol - p2, NULL);
+          unsigned int buf_len;
+          p = allocated_variable_expand_3 (p2, eol - p2, NULL, &buf_len);
 #endif
 
@@ -1038 +1050 @@
           if (*p == '\0')
             {
+#ifndef CONFIG_WITH_VALUE_LENGTH
               free (p);
+#else
+              recycle_variable_buffer (p, buf_len);
+#endif
               continue;
             }
@@ -1053 +1069 @@
                               &nameseq_cache);
 #endif
+#ifndef CONFIG_WITH_VALUE_LENGTH
           free (p);
+#else
+          recycle_variable_buffer (p, buf_len);
+#endif
 
           /* Save the state of conditionals and start

trunk/src/kmk/variable.h

@@ -192 +192 @@
 # define allocated_variable_expand(line) \
   allocated_variable_expand_2 (line, -1, NULL)
-char *allocated_variable_expand_2(const char *line, unsigned int length, unsigned int *value_lenp);
+char *allocated_variable_expand_2 (const char *line, unsigned int length, unsigned int *value_lenp);
+char *allocated_variable_expand_3 (const char *line, unsigned int length,
+                                   unsigned int *value_lenp, unsigned int *buffer_lengthp);
+void recycle_variable_buffer (char *buffer, unsigned int length);
 #endif /* CONFIG_WITH_VALUE_LENGTH */
 char *expand_argument (const char *str, const char *end);