Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Avoid reallocating buffer for quickfix lines three times #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Avoid reallocating buffer for quickfix lines three times #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 37 additions & 48 deletions src/quickfix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,31 @@ qf_init(
*/
#define LINE_MAXLEN 4096

static char_u *
qf_grow_linebuf(char_u **growbuf, int *growbufsiz, int newsz, int *allocsz)
{
/*
* If the line exceeds LINE_MAXLEN exclude the last
* byte since it's not a NL character.
*/
*allocsz = newsz > LINE_MAXLEN ? LINE_MAXLEN - 1 : newsz;
if (*growbuf == NULL)
{
*growbuf = alloc(*allocsz + 1);
if (*growbuf == NULL)
return NULL;
*growbufsiz = *allocsz;
}
else if (*allocsz > *growbufsiz)
{
*growbuf = vim_realloc(*growbuf, *allocsz + 1);
if (*growbuf == NULL)
return NULL;
*growbufsiz = *allocsz;
}
return *growbuf;
}

/*
* Read the errorfile "efile" into memory, line by line, building the error
* list.
Expand Down Expand Up @@ -538,24 +563,10 @@ qf_init_ext(

if (len > IOSIZE - 2)
{
/*
* If the line exceeds LINE_MAXLEN exclude the last
* byte since it's not a NL character.
*/
linelen = len > LINE_MAXLEN ? LINE_MAXLEN - 1 : len;
if (growbuf == NULL)
{
growbuf = alloc(linelen + 1);
growbufsiz = linelen;
}
else if (linelen > growbufsiz)
{
growbuf = vim_realloc(growbuf, linelen + 1);
if (growbuf == NULL)
goto qf_init_end;
growbufsiz = linelen;
}
linebuf = growbuf;
linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len,
&linelen);
if (linebuf == NULL)
goto qf_init_end;
}
else
{
Expand Down Expand Up @@ -584,22 +595,10 @@ qf_init_ext(
len = (int)STRLEN(p_li->li_tv.vval.v_string);
if (len > IOSIZE - 2)
{
linelen = len;
if (linelen > LINE_MAXLEN)
linelen = LINE_MAXLEN - 1;
if (growbuf == NULL)
{
growbuf = alloc(linelen + 1);
growbufsiz = linelen;
}
else if (linelen > growbufsiz)
{
if ((growbuf = vim_realloc(growbuf,
linelen + 1)) == NULL)
goto qf_init_end;
growbufsiz = linelen;
}
linebuf = growbuf;
linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len,
&linelen);
if (linebuf == NULL)
goto qf_init_end;
}
else
{
Expand All @@ -621,20 +620,10 @@ qf_init_ext(
linelen = (int)STRLEN(p_buf);
if (linelen > IOSIZE - 2)
{
if (growbuf == NULL)
{
growbuf = alloc(linelen + 1);
growbufsiz = linelen;
}
else if (linelen > growbufsiz)
{
if (linelen > LINE_MAXLEN)
linelen = LINE_MAXLEN - 1;
if ((growbuf = vim_realloc(growbuf, linelen + 1)) == NULL)
goto qf_init_end;
growbufsiz = linelen;
}
linebuf = growbuf;
linebuf = qf_grow_linebuf(&growbuf, &growbufsiz, len,
&linelen);
if (linebuf == NULL)
goto qf_init_end;
}
else
linebuf = IObuff;
Expand Down
13 changes: 11 additions & 2 deletions src/testdir/test_quickfix.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,14 +700,14 @@ endfunc

" Tests for the setqflist() and setloclist() functions
function SetXlistTests(cchar, bnum)
let Xwindow = a:cchar . 'window'
let Xnext = a:cchar . 'next'
if a:cchar == 'c'
let Xsetlist = function('setqflist')
let Xgetlist = function('getqflist')
let Xnext = 'cnext'
else
let Xsetlist = function('setloclist', [0])
let Xgetlist = function('getloclist', [0])
let Xnext = 'lnext'
endif

call Xsetlist([{'bufnr': a:bnum, 'lnum': 1},
Expand All @@ -723,6 +723,15 @@ function SetXlistTests(cchar, bnum)
exe Xnext
call assert_equal(3, line('.'))

" Appending entries to the list should not change the cursor position
" in the quickfix window
exe Xwindow
1
call Xsetlist([{'bufnr': a:bnum, 'lnum': 4},
\ {'bufnr': a:bnum, 'lnum': 5}], 'a')
call assert_equal(1, line('.'))
close

call Xsetlist([{'bufnr': a:bnum, 'lnum': 3},
\ {'bufnr': a:bnum, 'lnum': 4},
\ {'bufnr': a:bnum, 'lnum': 5}], 'r')
Expand Down