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

vim-patch:8.0.0551: the typeahead buffer is reallocated too often (#8598)

Browse Source 
Problem:    The typeahead buffer is reallocated too often.
Solution:   Re-use the existing buffer if possible.
d34f9b1155
This commit is contained in:
Jan Edmund Lazo 2018-06-19 18:56:55 -04:00 committed by Justin M. Keyes
parent f389fea8fa
commit b36aba9840
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/nvim/getchar.c
View File

@ -835,7 +835,7 @@ static void init_typebuf(void)
typebuf.tb_noremap = noremapbuf_init; typebuf.tb_noremap = noremapbuf_init;
typebuf.tb_buflen = TYPELEN_INIT; typebuf.tb_buflen = TYPELEN_INIT;
typebuf.tb_len = 0; typebuf.tb_len = 0;
typebuf.tb_off = 0; typebuf.tb_off = MAXMAPLEN + 4;
typebuf.tb_change_cnt = 1; typebuf.tb_change_cnt = 1;
} }
} }
@ -879,9 +879,15 @@ int ins_typebuf(char_u *str, int noremap, int offset, int nottyped, bool silent)
// Easy case: there is room in front of typebuf.tb_buf[typebuf.tb_off] // Easy case: there is room in front of typebuf.tb_buf[typebuf.tb_off]
typebuf.tb_off -= addlen; typebuf.tb_off -= addlen;
memmove(typebuf.tb_buf + typebuf.tb_off, str, (size_t)addlen); memmove(typebuf.tb_buf + typebuf.tb_off, str, (size_t)addlen);
} else if (typebuf.tb_len == 0
&& typebuf.tb_buflen >= addlen + 3 * (MAXMAPLEN + 4)) {
// Buffer is empty and string fits in the existing buffer.
// Leave some space before and after, if possible.
typebuf.tb_off = (typebuf.tb_buflen - addlen - 3 * (MAXMAPLEN + 4)) / 2;
memmove(typebuf.tb_buf + typebuf.tb_off, str, (size_t)addlen);
} else { } else {
// Need to allocate a new buffer. // Need to allocate a new buffer.
// In typebuf.tb_buf there must always be room for 3 * MAXMAPLEN + 4 // In typebuf.tb_buf there must always be room for 3 * (MAXMAPLEN + 4)
// characters. We add some extra room to avoid having to allocate too // characters. We add some extra room to avoid having to allocate too
// often. // often.
newoff = MAXMAPLEN + 4; newoff = MAXMAPLEN + 4;
@ -1145,7 +1151,7 @@ void alloc_typebuf(void)
typebuf.tb_buf = xmalloc(TYPELEN_INIT); typebuf.tb_buf = xmalloc(TYPELEN_INIT);
typebuf.tb_noremap = xmalloc(TYPELEN_INIT); typebuf.tb_noremap = xmalloc(TYPELEN_INIT);
typebuf.tb_buflen = TYPELEN_INIT; typebuf.tb_buflen = TYPELEN_INIT;
typebuf.tb_off = 0; typebuf.tb_off = MAXMAPLEN + 4; // can insert without realloc
typebuf.tb_len = 0; typebuf.tb_len = 0;
typebuf.tb_maplen = 0; typebuf.tb_maplen = 0;
typebuf.tb_silent = 0; typebuf.tb_silent = 0;