mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
patch 7.4.2297
Problem: When starting a job that reads from a buffer and reaching the end, the job hangs. Solution: Close the pipe or socket when all lines were read.
This commit is contained in:
parent
f37506f60f
commit
d8b554904d
@ -1424,11 +1424,14 @@ channel_write_in(channel_T *channel)
|
|||||||
ch_logn(channel, "written %d lines to channel", written);
|
ch_logn(channel, "written %d lines to channel", written);
|
||||||
|
|
||||||
in_part->ch_buf_top = lnum;
|
in_part->ch_buf_top = lnum;
|
||||||
if (lnum > buf->b_ml.ml_line_count)
|
if (lnum > buf->b_ml.ml_line_count || lnum > in_part->ch_buf_bot)
|
||||||
{
|
{
|
||||||
/* Writing is done, no longer need the buffer. */
|
/* Writing is done, no longer need the buffer. */
|
||||||
in_part->ch_bufref.br_buf = NULL;
|
in_part->ch_bufref.br_buf = NULL;
|
||||||
ch_log(channel, "Finished writing all lines to channel");
|
ch_log(channel, "Finished writing all lines to channel");
|
||||||
|
|
||||||
|
/* Close the pipe/socket, so that the other side gets EOF. */
|
||||||
|
may_close_part(&channel->CH_IN_FD);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
ch_logn(channel, "Still %d more lines to write",
|
ch_logn(channel, "Still %d more lines to write",
|
||||||
|
@ -792,6 +792,46 @@ func Test_pipe_from_buffer_nr()
|
|||||||
call Run_test_pipe_from_buffer(0)
|
call Run_test_pipe_from_buffer(0)
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Run_pipe_through_sort(all)
|
||||||
|
if !executable('sort') || !has('job')
|
||||||
|
return
|
||||||
|
endif
|
||||||
|
split sortin
|
||||||
|
call setline(1, ['ccc', 'aaa', 'ddd', 'bbb', 'eee'])
|
||||||
|
let options = {'in_io': 'buffer', 'in_name': 'sortin',
|
||||||
|
\ 'out_io': 'buffer', 'out_name': 'sortout'}
|
||||||
|
if !a:all
|
||||||
|
let options.in_top = 2
|
||||||
|
let options.in_bot = 4
|
||||||
|
endif
|
||||||
|
let g:job = job_start('sort', options)
|
||||||
|
call assert_equal("run", job_status(g:job))
|
||||||
|
call WaitFor('job_status(g:job) == "dead"')
|
||||||
|
call assert_equal("dead", job_status(g:job))
|
||||||
|
sp sortout
|
||||||
|
call assert_equal('Reading from channel output...', getline(1))
|
||||||
|
if a:all
|
||||||
|
call assert_equal(['aaa', 'bbb', 'ccc', 'ddd', 'eee'], getline(2, 6))
|
||||||
|
else
|
||||||
|
call assert_equal(['aaa', 'bbb', 'ddd'], getline(2, 4))
|
||||||
|
endif
|
||||||
|
|
||||||
|
call job_stop(g:job)
|
||||||
|
unlet g:job
|
||||||
|
bwipe! sortin
|
||||||
|
bwipe! sortout
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
func Test_pipe_through_sort_all()
|
||||||
|
call ch_log('Test_pipe_through_sort_all()')
|
||||||
|
call Run_pipe_through_sort(1)
|
||||||
|
endfunc
|
||||||
|
|
||||||
|
func Test_pipe_through_sort_some()
|
||||||
|
call ch_log('Test_pipe_through_sort_some()')
|
||||||
|
call Run_pipe_through_sort(0)
|
||||||
|
endfunc
|
||||||
|
|
||||||
func Test_pipe_to_nameless_buffer()
|
func Test_pipe_to_nameless_buffer()
|
||||||
if !has('job')
|
if !has('job')
|
||||||
return
|
return
|
||||||
|
@ -763,6 +763,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 */
|
||||||
|
/**/
|
||||||
|
2297,
|
||||||
/**/
|
/**/
|
||||||
2296,
|
2296,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user