aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.0.0551: the typeahead buffer is reallocated too often

Browse Source 
Problem:    The typeahead buffer is reallocated too often.
Solution:   Re-use the existing buffer if possible.
This commit is contained in:
Bram Moolenaar
2017-04-08 18:41:13 +02:00
parent 9585a1655b
commit d34f9b1155
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/getchar.c
View File

@@ -920,7 +920,7 @@ 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;
} }
} }
@@ -974,11 +974,21 @@ ins_typebuf(
typebuf.tb_off -= addlen; typebuf.tb_off -= addlen;
mch_memmove(typebuf.tb_buf + typebuf.tb_off, str, (size_t)addlen); mch_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;
mch_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.
*/ */
@@ -1291,7 +1301,7 @@ alloc_typebuf(void)
return FAIL; return FAIL;
} }
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;

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
551,
/**/ /**/
550, 550,
/**/ /**/