aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

patch 8.0.0964: channel write buffer does not work with poll()

Browse Source 
Problem:    Channel write buffer does not work with poll().
Solution:   Use the same mechanism as with select().
This commit is contained in:
Bram Moolenaar
2017-08-19 15:51:59 +02:00
parent d21f8b54b2
commit 683b796725
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/channel.c
View File

@@ -3018,7 +3018,9 @@ channel_fill_poll_write(int nfd_in, struct pollfd *fds)
{ {
chanpart_T *in_part = &ch->ch_part[PART_IN]; chanpart_T *in_part = &ch->ch_part[PART_IN];
if (in_part->ch_fd != INVALID_FD && in_part->ch_bufref.br_buf != NULL) if (in_part->ch_fd != INVALID_FD
&& (in_part->ch_bufref.br_buf != NULL
|| in_part->ch_writeque.wq_next != NULL))
{ {
in_part->ch_poll_idx = nfd; in_part->ch_poll_idx = nfd;
fds[nfd].fd = in_part->ch_fd; fds[nfd].fd = in_part->ch_fd;
@@ -3946,13 +3948,7 @@ channel_poll_check(int ret_in, void *fds_in)
idx = in_part->ch_poll_idx; idx = in_part->ch_poll_idx;
if (ret > 0 && idx != -1 && (fds[idx].revents & POLLOUT)) if (ret > 0 && idx != -1 && (fds[idx].revents & POLLOUT))
{ {
if (in_part->ch_buf_append) channel_write_input(channel);
{
if (in_part->ch_bufref.br_buf != NULL)
channel_write_new_lines(in_part->ch_bufref.br_buf);
}
else
channel_write_in(channel);
--ret; --ret;
} }
} }

2
src/version.c
View File

@@ -769,6 +769,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 */
/**/
964,
/**/ /**/
963, 963,
/**/ /**/