tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-25 23:14:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

select() fixes around timeout expiry return value

Browse Source
This commit is contained in:
manojampalam 2016-03-07 22:46:21 -08:00
parent 682fac1587
commit ae2873e8f1
2 changed files with 63 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/win32/win32compat/signal.c
View File

@ -15,8 +15,8 @@
* - any signals (errno = EINTR ) - TODO * - any signals (errno = EINTR ) - TODO
* - any of the supplied events set * - any of the supplied events set
* - any APCs caused by IO completions * - any APCs caused by IO completions
* - time out (errno = ETIMEOUT) * - time out
* - Returns 0 on IO completion and -1 on rest * - Returns 0 on IO completion, timeout -1 on rest
* if milli_seconds is 0, this function returns 0, its called with 0 * if milli_seconds is 0, this function returns 0, its called with 0
* to execute any scheduled APCs * to execute any scheduled APCs
*/ */
@ -35,11 +35,7 @@ wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds)
return 0; return 0;
} }
else if (ret == WAIT_TIMEOUT) { else if (ret == WAIT_TIMEOUT) {
if (milli_seconds == 0)
return 0; return 0;
errno = ETIMEDOUT;
debug("ERROR: wait timed out");
return -1;
} }
/* some other error*/ /* some other error*/
else { else {
@ -54,11 +50,7 @@ wait_for_any_event(HANDLE* events, int num_events, DWORD milli_seconds)
return 0; return 0;
} }
else if (ret == 0) { else if (ret == 0) {
if (milli_seconds == 0)
return 0; return 0;
errno = ETIMEDOUT;
debug("ERROR: wait timed out");
return -1;
} }
else { //some other error else { //some other error
errno = EOTHER; errno = EOTHER;

21
contrib/win32/win32compat/w32fd.c
View File

@ -91,7 +91,7 @@ fd_table_clear(int index)
void void
w32posix_initialize() { w32posix_initialize() {
if ( (fd_table_initialize() != 0) if ((fd_table_initialize() != 0)
|| (socketio_initialize() != 0)) || (socketio_initialize() != 0))
abort(); abort();
} }
@ -534,6 +534,10 @@ w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* excep
} }
} }
/* timeout specified and both fields are 0 - polling mode*/
/* proceed with further wait if not in polling mode*/
if ((timeout == NULL) || (timeout_ms != 0))
/* wait for io if none is already ready */ /* wait for io if none is already ready */
while (out_ready_fds == 0) { while (out_ready_fds == 0) {
ticks_spent = GetTickCount64() - ticks_start; ticks_spent = GetTickCount64() - ticks_start;
@ -541,12 +545,13 @@ w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* excep
if (timeout != NULL) { if (timeout != NULL) {
if (timeout_ms < ticks_spent) { if (timeout_ms < ticks_spent) {
errno = ETIMEDOUT;
debug("select timing out"); debug("select timing out");
return -1; break;
} }
time_rem = timeout_ms - (ticks_spent & 0xffffffff); time_rem = timeout_ms - (ticks_spent & 0xffffffff);
} }
else
time_rem = INFINITE;
if (0 != wait_for_any_event(events, num_events, time_rem)) if (0 != wait_for_any_event(events, num_events, time_rem))
return -1; return -1;
@ -572,16 +577,10 @@ w32_select(int fds, w32_fd_set* readfds, w32_fd_set* writefds, w32_fd_set* excep
} }
} }
if (out_ready_fds == 0) { if (out_ready_fds == 0)
if (timeout == 0) {
/* not timeout specified, return EAGAIN if none of fds are ready */
errno = EAGAIN;
return -1;
}
debug2("wait ended without any IO completion, looping again"); debug2("wait ended without any IO completion, looping again");
}
}; }
/* clear out fds that are not ready yet */ /* clear out fds that are not ready yet */
if (readfds) if (readfds)