Changeset 1865 in kBuild for trunk/src

Timestamp:

Oct 15, 2008 1:08:24 AM (17 years ago)

Author:

bird

Message:

kmk/incdep: don't allocate nameseq records, there will be a whole lot of them.

File:

• trunk/src/kmk/incdep.c (modified) (8 diffs)

trunk/src/kmk/incdep.c

@@ -126 +126 @@
 
     /* the parameters */
-    struct nameseq *filenames;      /* One only, its name is a strcache entry. */
+    struct incdep_strcache_entry *filename_entry; /* Converted to a nameseq record. */
     const char *pattern;            /* NULL */
     const char *pattern_percent;    /* NULL */
@@ -800 +800 @@
         void *free_me = rec_f;
         struct dep *dep;
+        struct nameseq *filenames;
 
         for (dep = rec_f->deps; dep; dep = dep->next)
           dep->name = incdep_flush_strcache_entry (dep->name);
-        rec_f->filenames->name = incdep_flush_strcache_entry (rec_f->filenames->name);
-
-        record_files (rec_f->filenames,
+
+        filenames = (struct nameseq *) alloccache_alloc (&nameseq_cache);
+        filenames->next = 0;
+        filenames->name = incdep_flush_strcache_entry (rec_f->filename_entry);
+
+        record_files (filenames,
                       rec_f->pattern,
                       rec_f->pattern_percent,
@@ -951 +955 @@
 static void
 incdep_record_files (struct incdep *cur,
-                     struct nameseq *filenames, const char *pattern,
+                     const char *filename, const char *pattern,
                      const char *pattern_percent, struct dep *deps,
                      unsigned int cmds_started, char *commands,
@@ -958 +962 @@
 {
   if (cur->worker_tid == -1)
-    record_files (filenames, pattern, pattern_percent, deps, cmds_started,
-                  commands, commands_idx, two_colon, flocp);
+    {
+      struct nameseq *filenames = (struct nameseq *) alloccache_alloc (&nameseq_cache);
+      filenames->next = 0;
+      filenames->name = filename;
+      record_files (filenames, pattern, pattern_percent, deps, cmds_started,
+                    commands, commands_idx, two_colon, flocp);
+    }
 #ifdef PARSE_IN_WORKER
   else
@@ -965 +974 @@
       struct incdep_recorded_files *rec = incdep_xmalloc (cur, sizeof (*rec));
 
-      rec->filenames = filenames;
+      rec->filename_entry = (struct incdep_strcache_entry *)filename;
       rec->pattern = pattern;
       rec->pattern_percent = pattern_percent;
@@ -1331 +1340 @@
               /* file: dependencies */
 
-              struct nameseq *filenames = 0;
+              const char *filename;
               struct dep *deps = 0;
               struct dep **nextdep = &deps;
@@ -1352 +1361 @@
                   break;
                 }
-              filenames = incdep_alloc_nameseq (curdep);
-              memset (filenames, 0, sizeof (*filenames));
-              filenames->name = incdep_record_strcache (curdep, cur, endp - cur);
+              filename = incdep_record_strcache (curdep, cur, endp - cur);
 
               /* parse any dependencies. */
@@ -1402 +1409 @@
               /* enter the file with its dependencies. */
               incdep_record_files (curdep,
-                                   filenames, NULL, NULL, deps, 0, NULL, 0, 0, f);
+                                   filename, NULL, NULL, deps, 0, NULL, 0, 0, f);
             }
         }