Changeset 1867 for trunk/src/kmk

Timestamp:

Oct 15, 2008, 3:28:32 AM (17 years ago)

Author:

bird

Message:

kmk: commands and file allocation caches.

Location:

trunk/src/kmk

Files:

• file.c (modified) (1 diff)
• main.c (modified) (2 diffs)
• make.h (modified) (1 diff)
• read.c (modified) (2 diffs)
• rule.c (modified) (1 diff)

trunk/src/kmk/file.c

@@ -252 +252 @@
     return f;
 
+#ifndef CONFIG_WITH_ALLOC_CACHES
   new = xmalloc (sizeof (struct file));
   memset (new, '\0', sizeof (struct file));
+#else
+  new = alloccache_calloc (&file_cache);
+#endif
   new->name = new->hname = name;
   new->update_status = -1;

trunk/src/kmk/main.c

@@ -646 +646 @@
 #ifdef CONFIG_WITH_ALLOC_CACHES
 struct alloccache dep_cache;
+struct alloccache file_cache;
+struct alloccache commands_cache;
 struct alloccache nameseq_cache;
 struct alloccache variable_cache;
@@ -655 +657 @@
 {
   alloccache_init (&dep_cache,               sizeof (struct dep),               "dep",               NULL, NULL);
+  alloccache_init (&file_cache,              sizeof (struct file),              "file",              NULL, NULL);
+  alloccache_init (&commands_cache,          sizeof (struct commands),          "commands",          NULL, NULL);
   alloccache_init (&nameseq_cache,           sizeof (struct nameseq),           "nameseq",           NULL, NULL);
   alloccache_init (&variable_cache,          sizeof (struct variable),          "variable",          NULL, NULL);

trunk/src/kmk/make.h

@@ -573 +573 @@
 /* the alloc caches */
 extern struct alloccache dep_cache;
+extern struct alloccache file_cache;
+extern struct alloccache commands_cache;
 extern struct alloccache nameseq_cache;
 extern struct alloccache variable_cache;

trunk/src/kmk/read.c

@@ -2298 +2298 @@
 
       nextf = filenames->next;
+#ifndef CONFIG_WITH_ALLOC_CACHES
       free (filenames);
+#else
+      alloccache_free (&nameseq_cache, filenames);
+#endif
 
       /* If it's a pattern target, then add it to the pattern-specific
@@ -2429 +2433 @@
   if (commands_idx > 0)
     {
+#ifndef CONFIG_WITH_ALLOC_CACHES
       cmds = xmalloc (sizeof (struct commands));
+#else
+      cmds = alloccache_alloc (&commands_cache);
+#endif
       cmds->fileinfo.filenm = flocp->filenm;
       cmds->fileinfo.lineno = cmds_started;

trunk/src/kmk/rule.c

@@ -393 +393 @@
     {
       r->terminal = terminal;
+#ifndef CONFIG_WITH_ALLOC_CACHES
       r->cmds = xmalloc (sizeof (struct commands));
+#else
+      r->cmds = alloccache_alloc (&commands_cache);
+#endif
       r->cmds->fileinfo.filenm = 0;
       r->cmds->fileinfo.lineno = 0;