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

Timestamp:

Oct 14, 2008 1:04:03 AM (16 years ago)

Author:

bird

Message:

kmk: some preliminary allocation caching. seems dep, variables, variable sets and files would be good candidates for generic alloc caches.

File:

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

trunk/src/kmk/incdep.c

@@ -150 +150 @@
   const char *err_msg;
 
+  struct dep *dep_start;            /* start of the current dep block. */
+  struct dep *dep_end;              /* end of the current dep block. */
+
   struct incdep_variable_in_set *recorded_variables_in_set_head;
   struct incdep_variable_in_set *recorded_variables_in_set_tail;
@@ -233 +236 @@
    For working around multithreaded performance problems found on Darwin,
    Linux (glibc), and possibly other systems. */
-static void *incdep_xmalloc (struct incdep *cur, size_t size)
+static void *
+incdep_xmalloc (struct incdep *cur, size_t size)
 {
   void *ptr;
@@ -255 +259 @@
 
 /* memset(malloc(sz),'\0',sz) wrapper. */
-static void *incdep_xcalloc (struct incdep *cur, size_t size)
+static void *
+incdep_xcalloc (struct incdep *cur, size_t size)
 {
   void *ptr;
@@ -275 +280 @@
 
 /* free wrapper */
-static void incdep_xfree (struct incdep *cur, void *ptr)
+static void
+incdep_xfree (struct incdep *cur, void *ptr)
 {
   /* free() *must* work for the allocation hacks above because
@@ -283 +289 @@
 }
 
+/* alloc a dep structure. These are allocated in bunches to save time. */
+struct dep *
+incdep_alloc_dep (struct incdep *cur)
+{
+  if (cur->dep_start != cur->dep_end)
+    return cur->dep_start++;
+
+  cur->dep_start = (struct dep *)incdep_xcalloc (cur, sizeof(struct dep) * 256);
+  cur->dep_end = cur->dep_start + 256;
+  return cur->dep_start++;
+}
 
 
@@ -457 +474 @@
 incdep_worker (void)
 {
+#ifdef PARSE_IN_WORKER
+  struct dep *dep_start = NULL;
+  struct dep *dep_end = NULL;
+#endif
+
   incdep_lock ();
 
@@ -480 +502 @@
       cur->is_worker = 1;
       incdep_read_file (cur, NILF);
+
 #ifdef PARSE_IN_WORKER
+      cur->dep_start = dep_start;
+      cur->dep_end = dep_end;
+
       eval_include_dep_file (cur, NILF);
-#endif
+
+      dep_start = cur->dep_start;
+      cur->dep_start = NULL;
+      dep_end = cur->dep_end;
+      cur->dep_end = NULL;
+#endif
+
       cur->is_worker = 0;
       incdep_lock ();
@@ -1337 +1369 @@
 
                   /* add it to the list. */
-                  *nextdep = dep = incdep_xcalloc (curdep, sizeof (*dep));
+                  *nextdep = dep = incdep_alloc_dep (curdep);
                   dep->name = incdep_record_strcache (curdep, cur, endp - cur);
                   dep->includedep = 1;
@@ -1441 +1473 @@
        cur->err_line_no = 0;
        cur->err_msg = NULL;
+       cur->dep_start = NULL;
+       cur->dep_end = NULL;
        cur->recorded_variables_in_set_head = NULL;
        cur->recorded_variables_in_set_tail = NULL;