mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
channels: delay free so that libuv can cleanup handles
add test for a crash this caused
This commit is contained in:
parent
2cbeb7ca56
commit
aea079a25d
@ -245,7 +245,8 @@ void channel_incref(Channel *channel)
|
|||||||
void channel_decref(Channel *channel)
|
void channel_decref(Channel *channel)
|
||||||
{
|
{
|
||||||
if (!(--channel->refcount)) {
|
if (!(--channel->refcount)) {
|
||||||
multiqueue_put(main_loop.fast_events, free_channel_event, 1, channel);
|
// delay free, so that libuv is done with the handles
|
||||||
|
multiqueue_put(main_loop.events, free_channel_event, 1, channel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -286,12 +287,15 @@ static void channel_destroy_early(Channel *chan)
|
|||||||
if ((chan->id != --next_chan_id)) {
|
if ((chan->id != --next_chan_id)) {
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
|
pmap_del(uint64_t)(channels, chan->id);
|
||||||
|
chan->id = 0;
|
||||||
|
|
||||||
if ((--chan->refcount != 0)) {
|
if ((--chan->refcount != 0)) {
|
||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
|
|
||||||
free_channel_event((void **)&chan);
|
// uv will keep a reference to handles until next loop tick, so delay free
|
||||||
|
multiqueue_put(main_loop.events, free_channel_event, 1, chan);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -640,6 +640,21 @@ describe('jobs', function()
|
|||||||
ok(string.find(err, "E475: Invalid argument: job cannot have both 'pty' and 'rpc' options set") ~= nil)
|
ok(string.find(err, "E475: Invalid argument: job cannot have both 'pty' and 'rpc' options set") ~= nil)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
it('does not crash when repeatedly failing to start shell', function()
|
||||||
|
source([[
|
||||||
|
set shell=nosuchshell
|
||||||
|
func! DoIt()
|
||||||
|
call jobstart('true')
|
||||||
|
call jobstart('true')
|
||||||
|
endfunc
|
||||||
|
]])
|
||||||
|
-- The crash only triggered if both jobs are cleaned up on the same event
|
||||||
|
-- loop tick. This is also prevented by try-block, so feed must be used.
|
||||||
|
feed_command("call DoIt()")
|
||||||
|
feed('<cr>') -- press RETURN
|
||||||
|
eq(2,eval('1+1'))
|
||||||
|
end)
|
||||||
|
|
||||||
it('jobstop() kills entire process tree #6530', function()
|
it('jobstop() kills entire process tree #6530', function()
|
||||||
command('set shell& shellcmdflag& shellquote& shellpipe& shellredir& shellxquote&')
|
command('set shell& shellcmdflag& shellquote& shellpipe& shellredir& shellxquote&')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user