From: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Precompute the istate.name_hash and istate.dir_hash values
for each cache-entry during the preload-index phase.
Move the expensive memihash() calculations from lazy_init_name_hash()
to the multi-threaded preload-index phase.
Signed-off-by: Jeff Hostetler <jeffhost@xxxxxxxxxxxxx>
Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
---
cache.h | 6 ++++++
name-hash.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
preload-index.c | 2 ++
read-cache.c | 3 +++
4 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/cache.h b/cache.h
index 61fc86e6d71..56f7c97cdbe 100644
--- a/cache.h
+++ b/cache.h
@@ -173,6 +173,10 @@ struct cache_entry {
unsigned int ce_flags;
unsigned int ce_namelen;
unsigned int index; /* for link extension */
+ struct {
+ unsigned initialized:1, root_entry:1;
+ unsigned int name, dir;
+ } precomputed_hash;
struct object_id oid;
char name[FLEX_ARRAY]; /* more */
};
@@ -229,6 +233,8 @@ struct cache_entry {
#error "CE_EXTENDED_FLAGS out of range"
#endif
+void precompute_istate_hashes(struct cache_entry *ce);
+
/* Forward structure decls */
struct pathspec;
struct child_process;
diff --git a/name-hash.c b/name-hash.c
index ad0bc0cef73..49eb84846df 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -50,6 +50,10 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
*/
struct dir_entry *dir;
unsigned int hash;
+ int orig_namelen = namelen;
+
+ if (ce->precomputed_hash.initialized && ce->precomputed_hash.root_entry)
+ return NULL; /* item does not have a parent directory */
/* get length of parent directory */
while (namelen > 0 && !is_dir_sep(ce->name[namelen - 1]))
@@ -59,7 +63,10 @@ static struct dir_entry *hash_dir_entry(struct index_state *istate,
namelen--;
/* lookup existing entry for that directory */
- hash = memihash(ce->name, namelen);
+ if (ce->precomputed_hash.initialized && orig_namelen == ce_namelen(ce))
+ hash = ce->precomputed_hash.dir;
+ else
+ hash = memihash(ce->name, namelen);
dir = find_dir_entry_1(istate, ce->name, namelen, hash);
if (!dir) {
/* not found, create it and add to hash table */
@@ -99,10 +106,18 @@ static void remove_dir_entry(struct index_state *istate, struct cache_entry *ce)
static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
{
+ unsigned int h;
+
if (ce->ce_flags & CE_HASHED)
return;
ce->ce_flags |= CE_HASHED;
- hashmap_entry_init(ce, memihash(ce->name, ce_namelen(ce)));
+
+ if (ce->precomputed_hash.initialized)
+ h = ce->precomputed_hash.name;
+ else
+ h = memihash(ce->name, ce_namelen(ce));
+
+ hashmap_entry_init(ce, h);
hashmap_add(&istate->name_hash, ce);
if (ignore_case)
@@ -244,3 +259,41 @@ void free_name_hash(struct index_state *istate)
hashmap_free(&istate->name_hash, 0);
hashmap_free(&istate->dir_hash, 1);
}
+
+/*
+ * Precompute the hash values for this cache_entry
+ * for use in the istate.name_hash and istate.dir_hash.
+ *
+ * If the item is in the root directory, just compute the hash value (for
+ * istate.name_hash) on the full path.
+ *
+ * If the item is in a subdirectory, first compute the hash value for the
+ * immediate parent directory (for istate.dir_hash) and then the hash value for
+ * the full path by continuing the computation.
+ *
+ * Note that these hashes will be used by wt_status_collect_untracked() as it
+ * scans the worktree and maps observed paths back to the index (optionally
+ * ignoring case). Technically, we only *NEED* to precompute this for
+ * non-skip-worktree items (since status should not observe skipped items), but
+ * because lazy_init_name_hash() hashes everything, we force it here.
+ */
+void precompute_istate_hashes(struct cache_entry *ce)
+{
+ int namelen = ce_namelen(ce);
+
+ while (namelen > 0 && !is_dir_sep(ce->name[namelen - 1]))
+ namelen--;
+
+ if (namelen <= 0) {
+ ce->precomputed_hash.name = memihash(ce->name, ce_namelen(ce));
+ ce->precomputed_hash.root_entry = 1;
+ } else {
+ namelen--;
+ ce->precomputed_hash.dir = memihash(ce->name, namelen);
+ ce->precomputed_hash.name = memihash_continue(
+ ce->precomputed_hash.dir, ce->name + namelen,
+ ce_namelen(ce) - namelen);
+ ce->precomputed_hash.root_entry = 0;
+ }
+ ce->precomputed_hash.initialized = 1;
+}
diff --git a/preload-index.c b/preload-index.c
index c1fe3a3ef9c..602737f9d0f 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -47,6 +47,8 @@ static void *preload_thread(void *_data)
struct cache_entry *ce = *cep++;
struct stat st;
+ precompute_istate_hashes(ce);
+
if (ce_stage(ce))
continue;
if (S_ISGITLINK(ce->ce_mode))
diff --git a/read-cache.c b/read-cache.c
index 9054369dd0c..1a25c345441 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -73,6 +73,7 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
copy_cache_entry(new, old);
new->ce_flags &= ~CE_HASHED;
new->ce_namelen = namelen;
+ new->precomputed_hash.initialized = 0;
new->index = 0;
memcpy(new->name, new_name, namelen + 1);
@@ -614,6 +615,7 @@ static struct cache_entry *create_alias_ce(struct index_state *istate,
new = xcalloc(1, cache_entry_size(len));
memcpy(new->name, alias->name, len);
copy_cache_entry(new, ce);
+ new->precomputed_hash.initialized = 0;
save_or_free_index_entry(istate, ce);
return new;
}
@@ -1446,6 +1448,7 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
ce->ce_stat_data.sd_size = get_be32(&ondisk->size);
ce->ce_flags = flags & ~CE_NAMEMASK;
ce->ce_namelen = len;
+ ce->precomputed_hash.initialized = 0;
ce->index = 0;
hashcpy(ce->oid.hash, ondisk->sha1);
memcpy(ce->name, name, len);
--
2.11.1.windows.1