Changeset 1870 for trunk/src/kmk/make.h

Timestamp:

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

Author:

bird

Message:

kmk: replaced strcache with strcacahe2.

File:

• trunk/src/kmk/make.h (modified) (2 diffs)

trunk/src/kmk/make.h

@@ -586 +586 @@
 void strcache_init (void);
 void strcache_print_stats (const char *prefix);
+#ifndef CONFIG_WITH_STRCACHE2
 int strcache_iscached (const char *str);
 const char *strcache_add (const char *str);
 const char *strcache_add_len (const char *str, int len);
 int strcache_setbufsize (int size);
-#ifdef CONFIG_WITH_INCLUDEDEP
+# ifdef CONFIG_WITH_INCLUDEDEP
 const char *strcache_add_prehashed (const char *str, int len,
                                     unsigned long hash1, unsigned long hash2);
-void strcache_prehash_str (const char *str, unsigned long *hash1p,
+void strcache_prehash_str (const char *str, unsigned int len, unsigned long *hash1p,
                            unsigned long *hash2p);
 #endif
@@ -633 +634 @@
 }
 
-#endif
+# endif /* CONFIG_WITH_VALUE_LENGTH*/
+
+#else  /* CONFIG_WITH_STRCACHE2 */
+
+# include "strcache2.h"
+extern struct strcache2 file_strcache;
+
+# define strcache_iscached(str)     strcache2_is_cached(&file_strcache, str)
+# define strcache_add(str)          strcache2_add(&file_strcache, str, strlen (str))
+# define strcache_add_len(str, len) strcache2_add(&file_strcache, str, len)
+# ifdef CONFIG_WITH_INCLUDEDEP
+#  define strcache_add_prehashed(str, len, hash1, hash2) \
+    strcache2_add_hashed(&file_strcache, str, len, hash1, hash2)
+#  ifdef HAVE_CASE_INSENSITIVE_FS
+#   define strcache_prehash_str(str, length, hash1p, hash2p) \
+     do { *(hash1p) = strcache2_hash_istr (str, length, (hash2p)); } while (0)
+#  else
+#   define strcache_prehash_str(str, length, hash1p, hash2p) \
+     do { *(hash1p) = strcache2_hash_str (str, length, (hash2p)); } while (0)
+#  endif
+# endif /* CONFIG_WITH_INCLUDEDEP */
+# ifdef CONFIG_WITH_VALUE_LENGTH
+#  define strcache_get_len(str)     strcache2_get_len(&file_strcache, str)
+#  define strcache_get_hash1(str)   strcache2_get_hash1(&file_strcache, str)
+#  define strcache_get_hash2(str)   strcache2_get_hash2(&file_strcache, str)
+# endif /* CONFIG_WITH_VALUE_LENGTH */
+
+#endif /* CONFIG_WITH_STRCACHE2 */
 
 #ifdef  HAVE_VFORK_H