Changeset 1878 in kBuild for trunk/src/kmk/dir.c

Timestamp:

Oct 17, 2008 1:46:59 AM (16 years ago)

Author:

bird

Message:

kmk: Use allocation caches for the tiny structs in dir.c (three caches / structs).

File:

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

trunk/src/kmk/dir.c

@@ -345 +345 @@
 static struct hash_table directory_contents;
 
+#ifdef CONFIG_WITH_ALLOC_CACHES
+/* Allocation cache for directory contents. */
+struct alloccache directory_contents_cache;
+#endif
+
 struct directory
   {
@@ -376 +381 @@
 /* Table of directories hashed by name.  */
 static struct hash_table directories;
+
+#ifdef CONFIG_WITH_ALLOC_CACHES
+/* Allocation cache for directories. */
+struct alloccache directories_cache;
+#endif
 
 /* Never have more than this many directories open at once.  */
@@ -420 +430 @@
 #endif
 
+#ifdef CONFIG_WITH_ALLOC_CACHES
+/* Allocation cache for dirfiles. */
+struct alloccache dirfile_cache;
+#endif
+
+
 
 static int dir_contents_file_exists_p (struct directory_contents *dir,
@@ -461 +477 @@
 
       p = name + strlen (name);
+#ifndef CONFIG_WITH_ALLOC_CACHES
       dir = xmalloc (sizeof (struct directory));
+#else
+      dir = alloccache_alloc (&directories_cache);
+#endif
       dir->name = strcache_add_len (name, p - name);
       hash_insert_at (&directories, dir, dir_slot);
@@ -521 +541 @@
               /* Nope; this really is a directory we haven't seen before.  */
 
+#ifndef CONFIG_WITH_ALLOC_CACHES
               dc = (struct directory_contents *)
                 xmalloc (sizeof (struct directory_contents));
+#else
+              dc = (struct directory_contents *)
+                    alloccache_alloc (&directory_contents_cache);
+#endif
 
               /* Enter it in the contents hash table.  */
@@ -744 +769 @@
 #endif
         {
+#ifndef CONFIG_WITH_ALLOC_CACHES
           df = xmalloc (sizeof (struct dirfile));
+#else
+          df = alloccache_alloc (&dirfile_cache);
+#endif
           df->name = strcache_add_len (d->d_name, len);
           df->length = len;
@@ -907 +936 @@
       /* The directory could not be stat'd.  We allocate a contents
          structure for it, but leave it out of the contents hash table.  */
+#ifndef CONFIG_WITH_ALLOC_CACHES
       dir->contents = xmalloc (sizeof (struct directory_contents));
+#else
+      dir->contents = alloccache_alloc (&directory_contents_cache);
+#endif
       memset (dir->contents, '\0', sizeof (struct directory_contents));
+
     }
 
@@ -919 +953 @@
   /* Make a new entry and put it in the table.  */
 
+#ifndef CONFIG_WITH_ALLOC_CACHES
   new = xmalloc (sizeof (struct dirfile));
+#else
+  new = alloccache_alloc (&dirfile_cache);
+#endif
   new->length = strlen (filename);
   new->name = strcache_add_len (filename, new->length);
@@ -1279 +1317 @@
              directory_contents_hash_1, directory_contents_hash_2,
              directory_contents_hash_cmp);
-}
+#ifdef CONFIG_WITH_ALLOC_CACHES
+  alloccache_init (&directories_cache, sizeof (struct directory),
+                   "directories", NULL, NULL);
+  alloccache_init (&directory_contents_cache, sizeof (struct directory_contents),
+                   "directory_contents", NULL, NULL);
+  alloccache_init (&dirfile_cache, sizeof (struct dirfile),
+                   "dirfile", NULL, NULL);
+#endif
+}