Changeset 1870 for trunk/src/kmk/strcache.c

Timestamp:

Oct 17, 2008, 1:15:30 AM (17 years ago)

Author:

bird

Message:

kmk: replaced strcache with strcacahe2.

File:

• trunk/src/kmk/strcache.c (modified) (3 diffs)

trunk/src/kmk/strcache.c

@@ -16 +16 @@
 
 #include "make.h"
+#ifndef CONFIG_WITH_STRCACHE2
 
 #include <assert.h>
 
 #include "hash.h"
+
 
 /* The size (in bytes) of each cache buffer.
@@ -381 +383 @@
 /* Performs the prehashing for use with strcache_add_prehashed(). */
 void
-strcache_prehash_str (const char *str, unsigned long *hash1p,
+strcache_prehash_str (const char *str, unsigned int len, unsigned long *hash1p,
                       unsigned long *hash2p)
 {
+  (void)len;
   *hash1p = str_hash_1 (str);
   *hash2p = str_hash_2 (str);
@@ -460 +463 @@
   hash_print_stats (&strings, stdout);
 }
+
+#else /* CONFIG_WITH_STRCACHE2 */
+
+#include "strcache2.h"
+
+/* The file string cache. */
+struct strcache2 file_strcache;
+
+void strcache_init (void)
+{
+  strcache2_init(&file_strcache,
+                 "file",        /* name */
+                 65536,         /* hash size */
+                 0,             /* default segment size*/
+#ifdef HAVE_CASE_INSENSITIVE_FS
+                 1,             /* case insensitive */
+#else
+                 0,             /* case insensitive */
+#endif
+                 0);            /* thread safe */
+}
+
+void
+strcache_print_stats (const char *prefix)
+{
+  strcache2_print_stats (&file_strcache, prefix);
+}
+
+
+#endif /* CONFIG_WITH_STRCACHE2 */