mirrors/git
1
0
Fork 0
Code Issues Pull Requests 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
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; static HANDLE hEvent;
WSANETWORKEVENTS ev; WSANETWORKEVENTS ev;
HANDLE h, handle_array[FD_SETSIZE + 2]; 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; fd_set rfds, wfds, xfds;
BOOL poll_again; BOOL poll_again;
MSG msg; MSG msg;
@ -459,6 +459,12 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
return -1; return -1;
} }
if (timeout != INFTIM)
{
orig_timeout = timeout;
start = GetTickCount();
}
if (!hEvent) if (!hEvent)
hEvent = CreateEvent (NULL, FALSE, FALSE, NULL); hEvent = CreateEvent (NULL, FALSE, FALSE, NULL);
@ -603,7 +609,13 @@ restart:
rc++; 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); SleepEx (1, TRUE);
goto restart; goto restart;