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

patch 7.4.1667

Browse Source 
Problem:    Win32: waiting on a pipe with fixed sleep time.
Solution:   Start with a short delay and increase it when looping.
This commit is contained in:
Bram Moolenaar
2016-03-28 14:20:41 +02:00
parent 46c00a6565
commit 84e1d2b21a
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/channel.c
View File

@@ -2371,8 +2371,9 @@ channel_wait(channel_T *channel, sock_T fd, int timeout)
if (fd != channel->CH_SOCK_FD) if (fd != channel->CH_SOCK_FD)
{ {
DWORD nread; DWORD nread;
int diff; int sleep_time;
DWORD deadline = GetTickCount() + timeout; DWORD deadline = GetTickCount() + timeout;
int delay = 1;
/* reading from a pipe, not a socket */ /* reading from a pipe, not a socket */
while (TRUE) while (TRUE)
@@ -2380,12 +2381,17 @@ channel_wait(channel_T *channel, sock_T fd, int timeout)
if (PeekNamedPipe((HANDLE)fd, NULL, 0, NULL, &nread, NULL) if (PeekNamedPipe((HANDLE)fd, NULL, 0, NULL, &nread, NULL)
&& nread > 0) && nread > 0)
return OK; return OK;
diff = deadline - GetTickCount(); sleep_time = deadline - GetTickCount();
if (diff <= 0) if (sleep_time <= 0)
break; break;
/* Wait for 5 msec. /* Wait for a little while. Very short at first, up to 10 msec
* TODO: increase the sleep time when looping more often */ * after looping a few times. */
Sleep(5); if (sleep_time > delay)
sleep_time = delay;
Sleep(sleep_time);
delay = delay * 2;
if (delay > 10)
delay = 10;
} }
} }
else else

2
src/version.c
View File

@@ -748,6 +748,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 */
/**/
1667,
/**/ /**/
1666, 1666,
/**/ /**/