Changeset 1874 in kBuild for trunk

Timestamp:

Oct 17, 2008 12:41:33 AM (16 years ago)

Author:

bird

Message:

incdep: The variable names should live in a different string cache.

File:

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

trunk/src/kmk/incdep.c

@@ -217 +217 @@
 static struct alloccache incdep_dep_caches[INCDEP_MAX_THREADS];
 static struct strcache2 incdep_dep_strcaches[INCDEP_MAX_THREADS];
+static struct strcache2 incdep_var_strcaches[INCDEP_MAX_THREADS];
 static unsigned incdep_num_threads;
 
@@ -316 +317 @@
 incdep_free_rec (struct incdep *cur, void *rec)
 {
-  alloccache_free (&incdep_rec_caches[cur->worker_tid], rec);
+  /*alloccache_free (&incdep_rec_caches[cur->worker_tid], rec); - doesn't work of course. */
 }
 
@@ -506 +507 @@
 
   incdep_xfree (cur, cur->file_base);
+  cur->next = NULL;
   free (cur);
 }
@@ -677 +679 @@
                      0);            /* thread safe */
 
+      strcache2_init(&incdep_var_strcaches[i],
+                     "incdep var",  /* name */
+                     32768,         /* hash size */
+                     0,             /* default segment size*/
+                     0,             /* case insensitive */
+                     0);            /* thread safe */
+
       /* create the thread. */
 #ifdef HAVE_PTHREAD
@@ -742 +751 @@
       alloccache_join (&dep_cache, &incdep_dep_caches[i]);
       strcache2_term (&incdep_dep_strcaches[i]);
+      strcache2_term (&incdep_var_strcaches[i]);
     }
   incdep_num_threads = 0;
@@ -869 +879 @@
 }
 
-/* Record / execute a strcache add. */
+/* Dependency or file strcache allocation / recording. */
 static const char *
-incdep_record_strcache (struct incdep *cur, const char *str, int len)
+incdep_dep_strcache (struct incdep *cur, const char *str, int len)
 {
   const char *ret;
@@ -889 +899 @@
       ret = strcache2_add (&incdep_dep_strcaches[cur->worker_tid], str, len);
       ret = (const char *)strcache2_get_entry(&incdep_dep_strcaches[cur->worker_tid], ret);
+    }
+  return ret;
+}
+
+/* Variable name allocation / recording. */
+static const char *
+incdep_var_strcache (struct incdep *cur, const char *str, int len)
+{
+  const char *ret;
+  if (cur->worker_tid == -1)
+    {
+      /* XXX: we're leaking this memory now! This will be fixed later. */
+      ret = xmalloc (len + 1);
+      memcpy ((char *)ret, str, len);
+      ((char *)ret)[len] = '\0';
+    }
+  else
+    {
+      /* Add it out the strcache of the thread. */
+      ret = strcache2_add (&incdep_var_strcaches[cur->worker_tid], str, len);
+      ret = (const char *)strcache2_get_entry(&incdep_var_strcaches[cur->worker_tid], ret);
     }
   return ret;
@@ -1112 +1143 @@
               break;
           }
-          var = incdep_record_strcache (curdep, cur, var_len);
+          var = incdep_var_strcache (curdep, cur, var_len);
 
           /* find the end of the variable. */
@@ -1270 +1301 @@
                   break;
                 }
-              var = incdep_record_strcache (curdep, cur, var_len);
+              var = incdep_var_strcache (curdep, cur, var_len);
 
               /* find the start of the value. */
@@ -1386 +1417 @@
                   break;
                 }
-              filename = incdep_record_strcache (curdep, cur, endp - cur);
+              filename = incdep_dep_strcache (curdep, cur, endp - cur);
 
               /* parse any dependencies. */
@@ -1425 +1456 @@
                   /* add it to the list. */
                   *nextdep = dep = incdep_alloc_dep (curdep);
-                  dep->name = incdep_record_strcache (curdep, cur, endp - cur);
+                  dep->name = incdep_dep_strcache (curdep, cur, endp - cur);
                   dep->includedep = 1;
                   nextdep = &dep->next;