Changeset 1794 in kBuild

Timestamp:

Sep 19, 2008 11:49:42 PM (17 years ago)

Author:

bird

Message:

kmk: Change the directory hash size to prevent /usr/bin from causing 3 rehashings.

File:

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

trunk/src/kmk/dir.c

@@ -219 +219 @@
 # else
 #define DIRECTORY_BUCKETS 199
-# endif 
+# endif
 #endif
 
@@ -565 +565 @@
               else
                 {
+#ifdef KMK
+                  int buckets = st.st_nlink * 2;
+                  if (buckets < DIRFILE_BUCKETS)
+                    buckets = DIRFILE_BUCKETS;
+                  hash_init (&dc->dirfiles, buckets,
+                             dirfile_hash_1, dirfile_hash_2, dirfile_hash_cmp);
+#else
                   hash_init (&dc->dirfiles, DIRFILE_BUCKETS,
                              dirfile_hash_1, dirfile_hash_2, dirfile_hash_cmp);
+#endif
                   /* Keep track of how many directories are open.  */
                   ++open_directories;
@@ -688 +696 @@
       if (d == 0)
         {
-/* bird: Workaround for smbfs mounts returning EBADF at the end of the search. 
+/* bird: Workaround for smbfs mounts returning EBADF at the end of the search.
          To exactly determin the cause here, I should probably do some smbfs
-         tracing, but for now just ignoring the EBADF on seems to work. 
+         tracing, but for now just ignoring the EBADF on seems to work.
          (The smb server is 64-bit vista, btw.) */
 #if defined (__FreeBSD__)
@@ -701 +709 @@
            && !strcmp(stfs.f_fstypename, "smbfs"))
             {
-              /*fprintf (stderr, "EBADF on remote fs! dirfd=%d errno=%d\n", 
+              /*fprintf (stderr, "EBADF on remote fs! dirfd=%d errno=%d\n",
                        dirfd (dir->dirstream), errno);*/
               saved_errno = 0;
@@ -1109 +1117 @@
               hash_print_stats (&dir->contents->dirfiles, stdout);
               fputs ("\n", stdout);
-#endif 
+#endif
             }
         }
@@ -1131 +1139 @@
   hash_print_stats (&directory_contents, stdout);
   fputs ("\n", stdout);
-#endif 
+#endif
 }