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

tv_dict_watcher_remove: delay freeing with busy queue

Browse Source
This commit is contained in:
Daniel Hahler 2019-11-29 09:42:58 +01:00 committed by Jan Edmund Lazo
parent 36caafeb28
commit 7268d49c50
No known key found for this signature in database
GPG Key ID: 64915E6E9F735B15
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/eval/typval.c
View File

@ -1183,8 +1183,12 @@ bool tv_dict_watcher_remove(dict_T *const dict, const char *const key_pattern,
QUEUE *w = NULL;
DictWatcher *watcher = NULL;
bool matched = false;
bool queue_is_busy = false;
QUEUE_FOREACH(w, &dict->watchers, {
watcher = tv_dict_watcher_node_data(w);
if (watcher->busy) {
queue_is_busy = true;
}
if (tv_callback_equal(&watcher->callback, &callback)
&& watcher->key_pattern_len == key_pattern_len
&& memcmp(watcher->key_pattern, key_pattern, key_pattern_len) == 0) {
@ -1197,10 +1201,10 @@ bool tv_dict_watcher_remove(dict_T *const dict, const char *const key_pattern,
return false;
}
QUEUE_REMOVE(w);
if (watcher->busy) {
if (queue_is_busy) {
watcher->needs_free = true;
} else {
QUEUE_REMOVE(w);
tv_dict_watcher_free(watcher);
}
return true;
@ -1273,9 +1277,13 @@ void tv_dict_watcher_notify(dict_T *const dict, const char *const key,
callback_call(&watcher->callback, 3, argv, &rettv);
watcher->busy = false;
tv_clear(&rettv);
if (watcher->needs_free) {
tv_dict_watcher_free(watcher);
}
}
})
QUEUE_FOREACH(w, &dict->watchers, {
DictWatcher *watcher = tv_dict_watcher_node_data(w);
if (watcher->needs_free) {
QUEUE_REMOVE(w);
tv_dict_watcher_free(watcher);
}
})
tv_dict_unref(dict);