development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'et/win32-poll-timeout'

Browse source 
* et/win32-poll-timeout:
  poll: honor the timeout on Win32
This commit is contained in:
Junio C Hamano 2015-09-17 12:29:02 -07:00
parent 1c1fee746e ef8b53e78c
commit 8d45eefe3e
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
compat/poll/poll.c
View file

@ -446,7 +446,7 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
static HANDLE hEvent;
WSANETWORKEVENTS ev;
HANDLE h, handle_array[FD_SETSIZE + 2];
DWORD ret, wait_timeout, nhandles;
DWORD ret, wait_timeout, nhandles, start = 0, elapsed, orig_timeout = 0;
fd_set rfds, wfds, xfds;
BOOL poll_again;
MSG msg;
@ -459,6 +459,12 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
return -1;
}
if (timeout != INFTIM)
{
orig_timeout = timeout;
start = GetTickCount();
}
if (!hEvent)
hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
@ -603,7 +609,13 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
rc++;
}
if (!rc && timeout == INFTIM)
if (!rc && orig_timeout && timeout != INFTIM)
{
elapsed = GetTickCount() - start;
timeout = elapsed >= orig_timeout ? 0 : orig_timeout - elapsed;
}
if (!rc && timeout)
{
SleepEx (1, TRUE);
goto restart;