adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.0.0618: calling function for reduce() has too much overhead

Browse Source 
Problem:    Calling function for reduce() has too much overhead.
Solution:   Do not create a funccall_T every time.
This commit is contained in:
Bram Moolenaar
2022-09-28 16:16:15 +01:00
parent 1936c76536
commit 82418263fa
10 changed files with 94 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dict.c
View File

@ -1315,6 +1315,8 @@ dict_filter_map(
dictitem_T *di;
int todo;
int rem;
typval_T newtv;
funccall_T *fc;
if (filtermap == FILTERMAP_MAPNEW)
{
@ -1335,6 +1337,9 @@ dict_filter_map(
d_ret = rettv->vval.v_dict;
}
// Create one funccal_T for all eval_expr_typval() calls.
fc = eval_expr_get_funccal(expr, &newtv);
if (filtermap != FILTERMAP_FILTER && d->dv_lock == 0)
d->dv_lock = VAR_LOCKED;
ht = &d->dv_hashtab;
@ -1345,7 +1350,6 @@ dict_filter_map(
if (!HASHITEM_EMPTY(hi))
{
int r;
typval_T newtv;
--todo;
di = HI2DI(hi);
@ -1357,8 +1361,7 @@ dict_filter_map(
break;
set_vim_var_string(VV_KEY, di->di_key, -1);
newtv.v_type = VAR_UNKNOWN;
r = filter_map_one(&di->di_tv, expr, filtermap,
&newtv, &rem);
r = filter_map_one(&di->di_tv, expr, filtermap, fc, &newtv, &rem);
clear_tv(get_vim_var_tv(VV_KEY));
if (r == FAIL || did_emsg)
{
@ -1398,6 +1401,8 @@ dict_filter_map(
}
hash_unlock(ht);
d->dv_lock = prev_lock;
if (fc != NULL)
remove_funccal();
}
/*