IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21555 from zeertzjq/vim-9.0.1096

Browse Source 
vim-patch:9.0.{1096,1097,1099,1100}: reallocating hashtab when the size didn't change
This commit is contained in:
zeertzjq 2022-12-27 19:29:43 +08:00 committed by GitHub
commit 4aec442b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/hashtab.c
View File

@ -292,6 +292,7 @@ static void hash_may_resize(hashtab_T *ht, size_t minitems)
#endif // ifdef HT_DEBUG #endif // ifdef HT_DEBUG
size_t minsize; size_t minsize;
const size_t oldsize = ht->ht_mask + 1;
if (minitems == 0) { if (minitems == 0) {
// Return quickly for small tables with at least two NULL items. // Return quickly for small tables with at least two NULL items.
// items are required for the lookup to decide a key isn't there. // items are required for the lookup to decide a key isn't there.
@ -304,7 +305,6 @@ static void hash_may_resize(hashtab_T *ht, size_t minitems)
// removed items, so that they get cleaned up). // removed items, so that they get cleaned up).
// Shrink the array when it's less than 1/5 full. When growing it is // Shrink the array when it's less than 1/5 full. When growing it is
// at least 1/4 full (avoids repeated grow-shrink operations) // at least 1/4 full (avoids repeated grow-shrink operations)
size_t oldsize = ht->ht_mask + 1;
if ((ht->ht_filled * 3 < oldsize * 2) && (ht->ht_used > oldsize / 5)) { if ((ht->ht_filled * 3 < oldsize * 2) && (ht->ht_used > oldsize / 5)) {
return; return;
} }
@ -335,6 +335,13 @@ static void hash_may_resize(hashtab_T *ht, size_t minitems)
} }
bool newarray_is_small = newsize == HT_INIT_SIZE; bool newarray_is_small = newsize == HT_INIT_SIZE;
if (!newarray_is_small && newsize == oldsize && ht->ht_filled * 3 < oldsize * 2) {
// The hashtab is already at the desired size, and there are not too
// many removed items, bail out.
return;
}
bool keep_smallarray = newarray_is_small bool keep_smallarray = newarray_is_small
&& ht->ht_array == ht->ht_smallarray; && ht->ht_array == ht->ht_smallarray;