mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
Preallocate hash tables when the number of inserts are known in advance
This avoids unnecessary re-allocations and reinsertions. On webkit.git (i.e. about 182k inserts to the name hash table), this reduces about 100ms out of 3s user time. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
03a0fb0ccf
commit
c73592812d
|
@ -389,6 +389,7 @@ static int find_exact_renames(struct diff_options *options)
|
||||||
struct hash_table file_table;
|
struct hash_table file_table;
|
||||||
|
|
||||||
init_hash(&file_table);
|
init_hash(&file_table);
|
||||||
|
preallocate_hash(&file_table, rename_src_nr + rename_dst_nr);
|
||||||
for (i = 0; i < rename_src_nr; i++)
|
for (i = 0; i < rename_src_nr; i++)
|
||||||
insert_file_table(&file_table, -1, i, rename_src[i].p->one);
|
insert_file_table(&file_table, -1, i, rename_src[i].p->one);
|
||||||
|
|
||||||
|
|
7
hash.h
7
hash.h
|
@ -40,4 +40,11 @@ static inline void init_hash(struct hash_table *table)
|
||||||
table->array = NULL;
|
table->array = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static inline void preallocate_hash(struct hash_table *table, unsigned int elts)
|
||||||
|
{
|
||||||
|
assert(table->size == 0 && table->nr == 0 && table->array == NULL);
|
||||||
|
table->size = elts * 2;
|
||||||
|
table->array = xcalloc(sizeof(struct hash_table_entry), table->size);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -92,6 +92,8 @@ static void lazy_init_name_hash(struct index_state *istate)
|
||||||
|
|
||||||
if (istate->name_hash_initialized)
|
if (istate->name_hash_initialized)
|
||||||
return;
|
return;
|
||||||
|
if (istate->cache_nr)
|
||||||
|
preallocate_hash(&istate->name_hash, istate->cache_nr);
|
||||||
for (nr = 0; nr < istate->cache_nr; nr++)
|
for (nr = 0; nr < istate->cache_nr; nr++)
|
||||||
hash_index_entry(istate, istate->cache[nr]);
|
hash_index_entry(istate, istate->cache[nr]);
|
||||||
istate->name_hash_initialized = 1;
|
istate->name_hash_initialized = 1;
|
||||||
|
|
Loading…
Reference in a new issue