Changeset 1793 in kBuild for trunk/src/kmk

Timestamp:

Sep 19, 2008 11:30:50 PM (16 years ago)

Author:

bird

Message:

kmk: hash table adjustments.

Location:

trunk/src/kmk

Files:

• file.c (modified) (4 diffs)
• function.c (modified) (4 diffs)
• make.h (modified) (2 diffs)
• strcache.c (modified) (1 diff)
• variable.c (modified) (3 diffs)

trunk/src/kmk/file.c

@@ -194 +194 @@
   if (second_target_expansion && strchr (name, '$') != NULL)
     new->need_2nd_target_expansion = 1;
-#endif 
+#endif
 
   return new;
@@ -344 +344 @@
 /* Performs secondary target name expansion and then renames
    the file using rename_file. */
-static void 
+static void
 do_2nd_target_expansion (struct file *f)
 {
@@ -695 +695 @@
 # ifdef KMK
       warn_undefined_variables_flag = save;
-# endif 
-    
+# endif
+
       /* Disable second target expansion now since we won't expand files
          entered after this point. (saves CPU cycles in enter_file()). */
@@ -1192 +1192 @@
 {
 #ifdef KMK
-  hash_init (&files, 8192, file_hash_1, file_hash_2, file_hash_cmp);
+  hash_init (&files, /*65535*/ 32755, file_hash_1, file_hash_2, file_hash_cmp);
 #else
   hash_init (&files, 1000, file_hash_1, file_hash_2, file_hash_cmp);

trunk/src/kmk/function.c

@@ -118 +118 @@
 
 #ifdef CONFIG_WITH_MAKE_STATS
-unsigned long make_stats_allocations = 0;
+long          make_stats_allocations = 0;
 unsigned long make_stats_allocated = 0;
 unsigned long make_stats_allocated_sum = 0;
@@ -3636 +3636 @@
   if (!argv[0] || (!argv[0][0] && !argv[1]))
     {
-      len = sprintf (buf, "alloc-cur: %5lu %6luKB (/%3luMB)  hash: %5lu %2lu%%",
+      len = sprintf (buf, "alloc-cur: %5ld %6luKB (/%3luMB)  hash: %5lu %2lu%%",
                      make_stats_allocations,
                      make_stats_allocated / 1024,
@@ -3713 +3713 @@
     }
   recursive = 1;
-  
+
   file = lookup_file (argv[0]);
   if (file && file->cmds)
@@ -3970 +3970 @@
 #ifdef CONFIG_WITH_DEFINED
   { STRING_SIZE_TUPLE("defined"),       1,  1,  1,  func_defined},
-#endif 
+#endif
 #ifdef CONFIG_WITH_TOUPPER_TOLOWER
   { STRING_SIZE_TUPLE("toupper"),       0,  1,  1,  func_toupper_tolower},

trunk/src/kmk/make.h

@@ -699 +699 @@
 
 #ifdef CONFIG_WITH_MAKE_STATS
-extern unsigned long make_stats_allocations;
+extern long make_stats_allocations;
 extern unsigned long make_stats_allocated;
 extern unsigned long make_stats_allocated_sum;
@@ -736 +736 @@
 extern char *abspath(const char *name, char *apath);
 extern char *func_breakpoint(char *o, char **argv, const char *funcname);
-#endif 
+#endif

trunk/src/kmk/strcache.c

@@ -191 +191 @@
 {
 #ifdef KMK
-  hash_init (&strings, 16384, str_hash_1, str_hash_2, str_hash_cmp);
+  hash_init (&strings, 65535, str_hash_1, str_hash_2, str_hash_cmp);
 #else
   hash_init (&strings, 8000, str_hash_1, str_hash_2, str_hash_cmp);

trunk/src/kmk/variable.c

@@ -421 +421 @@
 
 #ifndef VARIABLE_BUCKETS
-# ifdef KMK /* Move to Makefile.kmk? */
-#  define VARIABLE_BUCKETS              16384
+# ifdef KMK /* Move to Makefile.kmk? (insanely high, but wtf, it gets the collitions down) */
+#  define VARIABLE_BUCKETS              65535
 # else  /*!KMK*/
 #define VARIABLE_BUCKETS                523
@@ -429 +429 @@
 #ifndef PERFILE_VARIABLE_BUCKETS
 # ifdef KMK /* Move to Makefile.kmk? */
-#  define PERFILE_VARIABLE_BUCKETS      64
+#  define PERFILE_VARIABLE_BUCKETS      127
 # else
 #define PERFILE_VARIABLE_BUCKETS        23
@@ -436 +436 @@
 #ifndef SMALL_SCOPE_VARIABLE_BUCKETS
 # ifdef KMK /* Move to Makefile.kmk? */
-#  define SMALL_SCOPE_VARIABLE_BUCKETS  32
+#  define SMALL_SCOPE_VARIABLE_BUCKETS  63
 # else
 #define SMALL_SCOPE_VARIABLE_BUCKETS    13