Changeset 2056 in kBuild

Timestamp:

Nov 4, 2008 3:25:19 AM (17 years ago)

Author:

bird

Message:

kmk: some MBs of memory during building by freeing up the chopped up command lines after we're done with them. (Code not perfect, but wtf., it saves me 7 MBs (out of 45), a bunch of faults and turns out to using less cpu time...)

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (1 diff)
• commands.h (modified) (1 diff)
• default.c (modified) (1 diff)
• job.c (modified) (2 diffs)
• read.c (modified) (1 diff)
• rule.c (modified) (2 diffs)

trunk/src/kmk/Makefile.kmk

@@ -172 +172 @@
         CONFIG_WITH_RDONLY_VARIABLE_VALUE \
         CONFIG_WITH_LAZY_DEPS_VARS \
+        CONFIG_WITH_MEMORY_OPTIMIZATIONS \
         \
         KBUILD_HOST=\"$(KBUILD_TARGET)\" \

trunk/src/kmk/commands.h

@@ -33 +33 @@
     int any_recurse;            /* Nonzero if any `lines_recurse' elt has */
                                 /* the COMMANDS_RECURSE bit set.  */
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+    int refs;                   /* References.  */
+#endif
   };
 

trunk/src/kmk/default.c

@@ -584 +584 @@
       if (f->cmds == 0)
         {
+#ifndef CONFIG_WITH_ALLOC_CACHES
           f->cmds = xmalloc (sizeof (struct commands));
+#else
+          f->cmds = alloccache_alloc (&commands_cache);
+#endif
           f->cmds->fileinfo.filenm = 0;
           f->cmds->commands = s[1];
           f->cmds->command_lines = 0;
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+          f->cmds->refs = 1000;
+#endif
         }
     }

trunk/src/kmk/job.c

@@ -944 +944 @@
     }
 
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+  /* Free the chopped command lines for simple targets when
+     there are no more active references to them.  */
+
+  child->file->cmds->refs--;
+  if (   !child->file->intermediate
+      && !child->file->pat_variables
+      && child->file->cmds->refs == 0)
+    {
+      struct commands *cmds = child->file->cmds;
+      unsigned int i;
+
+      for (i = 0; i < cmds->ncommand_lines; ++i)
+        {
+          free (cmds->command_lines[i]);
+          cmds->command_lines[i] = 0;
+        }
+      free (cmds->command_lines);
+      cmds->command_lines = 0;
+      free (cmds->lines_flags);
+      cmds->lines_flags = 0;
+      cmds->ncommand_lines = 0;
+    }
+#endif /* CONFIG_WITH_MEMORY_OPTIMIZATIONS */
+
   free (child);
 }
@@ -1682 +1707 @@
   /* Chop the commands up into lines if they aren't already.  */
   chop_commands (cmds);
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+  cmds->refs++; /* retain the chopped lines.  */
+#endif
 
   /* Expand the command lines and store the results in LINES.  */

trunk/src/kmk/read.c

@@ -2540 +2540 @@
       cmds->commands = savestring (commands, commands_idx);
       cmds->command_lines = 0;
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+      cmds->refs = 0;
+#endif
     }
   else

trunk/src/kmk/rule.c

@@ -404 +404 @@
       r->cmds->commands = xstrdup (p->commands);
       r->cmds->command_lines = 0;
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+      r->cmds->refs = 1000;
+#endif
     }
 }
@@ -489 +492 @@
   if (new_pattern_rule (r, override))
     r->terminal = terminal;
+#ifdef CONFIG_WITH_MEMORY_OPTIMIZATIONS
+  commands->refs = 1000;
+#endif
 }