Changeset 1872 in kBuild for trunk/src/kmk/incdep.c

Timestamp:

Oct 17, 2008 12:05:27 AM (16 years ago)

Author:

bird

Message:

incdep: use an allocation cache for the records to reduce xmalloc and free calls.

File:

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

trunk/src/kmk/incdep.c

@@ -93 +93 @@
     struct incdep_variable_in_set *next;
     /* the parameters */
-    struct strcache2_entry *name_entry; /* dep strcache */
-    const char *value;              /* xmalloc'ed */
+    struct strcache2_entry *name_entry;     /* dep strcache - WRONG */
+    const char *value;                      /* xmalloc'ed */
     unsigned int value_length;
-    int duplicate_value;            /* 0 */
+    int duplicate_value;                    /* 0 */
     enum variable_origin origin;
     int recursive;
     struct variable_set *set;
-    const struct floc *flocp;       /* NILF */
+    const struct floc *flocp;               /* NILF */
 };
 
@@ -107 +107 @@
     struct incdep_variable_def *next;
     /* the parameters */
-    const struct floc *flocp;       /* NILF */
-    struct strcache2_entry *name_entry; /* dep strcache */
-    char *value;                    /* xmalloc'ed, free it */
+    const struct floc *flocp;               /* NILF */
+    struct strcache2_entry *name_entry;     /* dep strcache - WRONG */
+    char *value;                            /* xmalloc'ed, free it */
     unsigned int value_length;
     enum variable_origin origin;
@@ -122 +122 @@
     /* the parameters */
     struct strcache2_entry *filename_entry; /* dep strcache; converted to a nameseq record. */
-    const char *pattern;            /* NULL */
-    const char *pattern_percent;    /* NULL */
-    struct dep *deps;               /* All the names are dep strcache entries. */
-    unsigned int cmds_started;      /* 0 */
-    char *commands;                 /* NULL */
-    unsigned int commands_idx;      /* 0 */
-    int two_colon;                  /* 0 */
-    const struct floc *flocp;       /* NILF */
+    const char *pattern;                    /* NULL */
+    const char *pattern_percent;            /* NULL */
+    struct dep *deps;                       /* All the names are dep strcache entries. */
+    unsigned int cmds_started;              /* 0 */
+    char *commands;                         /* NULL */
+    unsigned int commands_idx;              /* 0 */
+    int two_colon;                          /* 0 */
+    const struct floc *flocp;               /* NILF */
 };
 
@@ -202 +202 @@
 /* The handles to the worker threads. */
 #ifdef HAVE_PTHREAD
-static pthread_t incdep_threads[1];
-static struct alloccache incdep_dep_caches[1];
-static struct strcache2 incdep_dep_strcaches[1];
+# define INCDEP_MAX_THREADS 1
+static pthread_t incdep_threads[INCDEP_MAX_THREADS];
 
 #elif defined (WINDOWS32)
-static HANDLE incdep_threads[2];
-static struct alloccache incdep_dep_caches[2];
-static struct strcache2 incdep_dep_strcaches[2];
+# define INCDEP_MAX_THREADS 2
+static HANDLE incdep_threads[INCDEP_MAX_THREADS];
 
 #elif defined (__OS2__)
-static TID incdep_threads[2];
-static struct alloccache incdep_dep_caches[2];
-static struct strcache2 incdep_dep_strcaches[2];
-#endif
+# define INCDEP_MAX_THREADS 2
+static TID incdep_threads[INCDEP_MAX_THREADS];
+#endif
+
+static struct alloccache incdep_rec_caches[INCDEP_MAX_THREADS];
+static struct alloccache incdep_dep_caches[INCDEP_MAX_THREADS];
+static struct strcache2 incdep_dep_strcaches[INCDEP_MAX_THREADS];
 static unsigned incdep_num_threads;
 
@@ -304 +305 @@
 }
 
+/* allocate a record. */
+static void *
+incdep_alloc_rec (struct incdep *cur)
+{
+  return alloccache_alloc (&incdep_rec_caches[cur->worker_tid]);
+}
+
+
 /* grow a cache. */
 static void *
@@ -314 +323 @@
   return xmalloc (size);
 #endif
+}
+
+/* term a cache. */
+static void
+incdep_cache_deallocator (void *thrd, void *ptr, unsigned int size)
+{
+  (void)thrd;
+  (void)size;
+  free (ptr);
 }
 
@@ -632 +650 @@
     {
       /* init caches */
+      unsigned rec_size = sizeof (struct incdep_variable_in_set);
+      if (rec_size < sizeof (struct incdep_variable_def))
+        rec_size = sizeof (struct incdep_variable_def);
+      if (rec_size < sizeof (struct incdep_recorded_files))
+        rec_size = sizeof (struct incdep_recorded_files);
+      alloccache_init (&incdep_rec_caches[i], rec_size, "incdep rec",
+                       incdep_cache_allocator, (void *)(size_t)i);
       alloccache_init (&incdep_dep_caches[i], sizeof(struct dep), "incdep dep",
                        incdep_cache_allocator, (void *)(size_t)i);
@@ -706 +731 @@
       /* more later? */
 
+      /* terminate or join up the allocation caches. */
+      alloccache_term (&incdep_rec_caches[i], incdep_cache_deallocator, (void *)(size_t)i);
       alloccache_join (&dep_cache, &incdep_dep_caches[i]);
       strcache2_term (&incdep_dep_strcaches[i]);
@@ -747 +774 @@
     do
       {
-        void *free_me = rec_vis;
         unsigned int name_length = rec_vis->name_entry->length;
         define_variable_in_set (incdep_flush_strcache_entry (rec_vis->name_entry),
@@ -759 +785 @@
                                 rec_vis->flocp);
         rec_vis = rec_vis->next;
-        incdep_xfree (cur, free_me);
       }
     while (rec_vis);
@@ -770 +795 @@
     do
       {
-        void *free_me = rec_vd;
         do_variable_definition_2 (rec_vd->flocp,
                                   incdep_flush_strcache_entry (rec_vd->name_entry),
@@ -781 +805 @@
                                   rec_vd->target_var);
         rec_vd = rec_vd->next;
-        incdep_xfree (cur, free_me);
       }
     while (rec_vd);
@@ -792 +815 @@
     do
       {
-        void *free_me = rec_f;
         struct dep *dep;
         struct nameseq *filenames;
@@ -814 +836 @@
 
         rec_f = rec_f->next;
-        incdep_xfree (cur, free_me);
       }
     while (rec_f);
@@ -881 +902 @@
   else
     {
-      struct incdep_variable_in_set *rec = incdep_xmalloc (cur, sizeof (*rec));
+      struct incdep_variable_in_set *rec =
+        (struct incdep_variable_in_set *)incdep_alloc_rec (cur);
       rec->name_entry = (struct strcache2_entry *)name;
       rec->value = value;
@@ -919 +941 @@
   else
     {
-      struct incdep_variable_def *rec = incdep_xmalloc (cur, sizeof (*rec));
+      struct incdep_variable_def *rec =
+        (struct incdep_variable_def *)incdep_alloc_rec (cur);
       rec->flocp = flocp;
       rec->name_entry = (struct strcache2_entry *)name;
@@ -960 +983 @@
   else
     {
-      struct incdep_recorded_files *rec = incdep_xmalloc (cur, sizeof (*rec));
+      struct incdep_recorded_files *rec =
+        (struct incdep_recorded_files *) incdep_alloc_rec (cur);
 
       rec->filename_entry = (struct strcache2_entry *)filename;