mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 11:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9218 from bfredl/termbuf

Browse Source 
channel: avoid buffering output when only terminal and no callbacks are active
This commit is contained in:
Björn Linse
2018-11-08 23:48:34 +01:00
committed by GitHub
parent d36afafc8d 312afd8e2e
commit 16bc1e9c17
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/channel.c
View File

@@ -607,14 +607,17 @@ static void on_channel_output(Stream *stream, Channel *chan, RBuffer *buf,
} }
rbuffer_consumed(buf, count); rbuffer_consumed(buf, count);
if (callback_reader_set(*reader) || reader->buffered) {
// if buffer wasn't consumed, a pending callback is stalled. Aggregate the // if buffer wasn't consumed, a pending callback is stalled. Aggregate the
// received data and avoid a "burst" of multiple callbacks. // received data and avoid a "burst" of multiple callbacks.
bool buffer_set = reader->buffer.ga_len > 0; bool buffer_set = reader->buffer.ga_len > 0;
ga_concat_len(&reader->buffer, ptr, count); ga_concat_len(&reader->buffer, ptr, count);
if (!reader->buffered && !buffer_set && callback_reader_set(*reader)) { if (callback_reader_set(*reader) && !reader->buffered && !buffer_set) {
process_channel_event(chan, &reader->cb, type, reader, 0); process_channel_event(chan, &reader->cb, type, reader, 0);
} }
} }
}
static void on_buffered_error(void **args) static void on_buffered_error(void **args)
{ {