aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 7.4.1379

Browse Source 
Problem:    Channel test fails on Win32 console.
Solution:   Don't sleep when timeout is zero. Call channel_wait() before
            channel_read(). Channels are not polled during ":sleep". (Yukihiro
            Nakadaira)
This commit is contained in:
Bram Moolenaar
2016-02-21 17:20:55 +01:00
parent 65edff8f51
commit b7522a2f0c
5 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/channel.c
View File

@@ -1582,7 +1582,7 @@ channel_wait(channel_T *channel, sock_T fd, int timeout)
&& nread > 0)
return OK;
diff = deadline - GetTickCount();
if (diff < 0)
if (diff <= 0)
break;
/* Wait for 5 msec.
* TODO: increase the sleep time when looping more often */
@@ -1881,17 +1881,19 @@ channel_fd2channel(sock_T fd, int *partp)
}
return NULL;
}
# endif
# if defined(WIN32) || defined(PROTO)
/*
* Check the channels for anything that is ready to be read.
* The data is put in the read queue.
*/
void
channel_handle_events(void)
{
channel_T *channel;
int part;
static int loop = 0;
/* Skip heavily polling */
if (loop++ % 2)
return;
sock_T fd;
for (channel = first_channel; channel != NULL; channel = channel->ch_next)
{
@@ -1907,7 +1909,11 @@ channel_handle_events(void)
part = PART_SOCK;
# endif
# endif
channel_read(channel, part, "channel_handle_events");
{
fd = channel->ch_part[part].ch_fd;
if (fd != INVALID_FD && channel_wait(channel, fd, 0) == OK)
channel_read(channel, part, "channel_handle_events");
}
}
}
# endif