kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1100: a hashtab with many removed items is not cleaned up

Browse Source 
Problem:    A hashtab with many removed items is not cleaned up.
Solution:   Re-hash a hashtab even when the size didn't change if too many
            items were removed.

d0883faac6

N/A patches for version.c:

vim-patch:9.0.1099: trying to resize a hashtab may cause a problem

Problem:    Trying to resize a hashtab may cause a problem.
Solution:   Do not try to resize a hashtab before adding an item.

81b7ecc5cb

Co-authored-by: Bram Moolenaar <Bram@vim.org>
This commit is contained in:
zeertzjq 2022-12-27 18:58:24 +08:00
parent 9bab4b72ae
commit 45d9735aae
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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;
} }
@ -336,8 +336,9 @@ 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 == ht->ht_mask + 1) { if (!newarray_is_small && newsize == oldsize && ht->ht_filled * 3 < oldsize * 2) {
// the hashtab is already at the desired size, bail out // The hashtab is already at the desired size, and there are not too
// many removed items, bail out.
return; return;
} }