From: Thomas Rast Date: Sat, 06 Sep 2014 17:57:05 GMT Subject: [PATCH v3 7/8] name-hash: allow dir hashing even when !ignore_case Message-ID: <4d43fca586637dcb02b2b19c8d8a6dcfe368e059.1409860234.git.tr@thomasrast.ch> In-Reply-To: The directory hash (for fast checks if the index already has a directory) was only used in ignore_case mode and so depended on that flag. Make it generally available on request. Signed-off-by: Thomas Rast --- cache.h | 2 ++ name-hash.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index 4d5b76c..c54b2e1 100644 --- a/cache.h +++ b/cache.h @@ -306,6 +306,7 @@ struct index_state { struct split_index *split_index; struct cache_time timestamp; unsigned name_hash_initialized : 1, + has_dir_hash : 1, initialized : 1; struct hashmap name_hash; struct hashmap dir_hash; @@ -315,6 +316,7 @@ struct index_state { extern struct index_state the_index; /* Name hashing */ +extern void init_name_hash(struct index_state *istate, int force_dir_hash); extern void add_name_hash(struct index_state *istate, struct cache_entry *ce); extern void remove_name_hash(struct index_state *istate, struct cache_entry *ce); extern void free_name_hash(struct index_state *istate); diff --git a/name-hash.c b/name-hash.c index 702cd05..22e3ec6 100644 --- a/name-hash.c +++ b/name-hash.c @@ -106,7 +106,7 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce) hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce))); hashmap_add(&istate->name_hash, ce); - if (ignore_case) + if (istate->has_dir_hash) add_dir_entry(istate, ce); } @@ -121,7 +121,7 @@ static int cache_entry_cmp(const struct cache_entry *ce1, return remove ? !(ce1 == ce2) : 0; } -static void lazy_init_name_hash(struct index_state *istate) +void init_name_hash(struct index_state *istate, int force_dir_hash) { int nr; @@ -130,6 +130,9 @@ static void lazy_init_name_hash(struct index_state *istate) hashmap_init(&istate->name_hash, (hashmap_cmp_fn) cache_entry_cmp, istate->cache_nr); hashmap_init(&istate->dir_hash, (hashmap_cmp_fn) dir_entry_cmp, 0); + + istate->has_dir_hash = force_dir_hash || ignore_case; + for (nr = 0; nr < istate->cache_nr; nr++) hash_index_entry(istate, istate->cache[nr]); istate->name_hash_initialized = 1; @@ -148,7 +151,7 @@ void remove_name_hash(struct index_state *istate, struct cache_entry *ce) ce->ce_flags &= ~CE_HASHED; hashmap_remove(&istate->name_hash, ce, ce); - if (ignore_case) + if (istate->has_dir_hash) remove_dir_entry(istate, ce); } @@ -193,7 +196,7 @@ struct cache_entry *index_dir_exists(struct index_state *istate, const char *nam struct cache_entry *ce; struct dir_entry *dir; - lazy_init_name_hash(istate); + init_name_hash(istate, 0); dir = find_dir_entry(istate, name, namelen); if (dir && dir->nr) return dir->ce; @@ -214,7 +217,7 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na { struct cache_entry *ce; - lazy_init_name_hash(istate); + init_name_hash(istate, 0); ce = hashmap_get_from_hash(&istate->name_hash, memihash(name, namelen), NULL); -- 2.1.0.72.g9b94086