mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 8.0.1774: reading very long lines can be slow
Problem: Reading very long lines can be slow. Solution: Read up to 1 Mbyte at a time to avoid a lot of copying. Add a check for going over the column limit.
This commit is contained in:
parent
c36651b4b9
commit
13d3b05ed2
36
src/fileio.c
36
src/fileio.c
@ -1209,28 +1209,42 @@ retry:
|
|||||||
* The amount is limited by the fact that read() only can read
|
* The amount is limited by the fact that read() only can read
|
||||||
* upto max_unsigned characters (and other things).
|
* upto max_unsigned characters (and other things).
|
||||||
*/
|
*/
|
||||||
#if VIM_SIZEOF_INT <= 2
|
|
||||||
if (linerest >= 0x7ff0)
|
|
||||||
{
|
|
||||||
++split;
|
|
||||||
*ptr = NL; /* split line by inserting a NL */
|
|
||||||
size = 1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
if (!skip_read)
|
if (!skip_read)
|
||||||
{
|
{
|
||||||
#if VIM_SIZEOF_INT > 2
|
#if VIM_SIZEOF_INT > 2
|
||||||
# if defined(SSIZE_MAX) && (SSIZE_MAX < 0x10000L)
|
# if defined(SSIZE_MAX) && (SSIZE_MAX < 0x10000L)
|
||||||
size = SSIZE_MAX; /* use max I/O size, 52K */
|
size = SSIZE_MAX; /* use max I/O size, 52K */
|
||||||
# else
|
# else
|
||||||
size = 0x10000L; /* use buffer >= 64K */
|
/* Use buffer >= 64K. Add linerest to double the size if the
|
||||||
|
* line gets very long, to avoid a lot of copying. But don't
|
||||||
|
* read more than 1 Mbyte at a time, so we can be interrupted.
|
||||||
|
*/
|
||||||
|
size = 0x10000L + linerest;
|
||||||
|
if (size > 0x100000L)
|
||||||
|
size = 0x100000L;
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
size = 0x7ff0L - linerest; /* limit buffer to 32K */
|
size = 0x7ff0L - linerest; /* limit buffer to 32K */
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Protect against the argument of lalloc() going negative. */
|
||||||
|
if (
|
||||||
|
#if VIM_SIZEOF_INT <= 2
|
||||||
|
linerest >= 0x7ff0
|
||||||
|
#else
|
||||||
|
size < 0 || size + linerest + 1 < 0 || linerest >= MAXCOL
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
{
|
||||||
|
++split;
|
||||||
|
*ptr = NL; /* split line by inserting a NL */
|
||||||
|
size = 1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!skip_read)
|
||||||
|
{
|
||||||
for ( ; size >= 10; size = (long)((long_u)size >> 1))
|
for ( ; size >= 10; size = (long)((long_u)size >> 1))
|
||||||
{
|
{
|
||||||
if ((new_buffer = lalloc((long_u)(size + linerest + 1),
|
if ((new_buffer = lalloc((long_u)(size + linerest + 1),
|
||||||
|
@ -761,6 +761,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 */
|
||||||
|
/**/
|
||||||
|
1774,
|
||||||
/**/
|
/**/
|
||||||
1773,
|
1773,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user