curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-21 03:22:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

sockfilt: remove redundancy in timeout handling

Browse Source 
And update other logmsg output in select_ws on Windows.
This commit is contained in:
Marc Hoersken 2020-03-29 17:18:34 +02:00
parent 3d1f35eb13
commit 57476a91e4
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/server/sockfilt.c
View File

@ -750,7 +750,7 @@ struct select_ws_data {
HANDLE thread; /* the internal thread handle (indexed by thd) */ HANDLE thread; /* the internal thread handle (indexed by thd) */
}; };
static int select_ws(int nfds, fd_set *readfds, fd_set *writefds, static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
fd_set *exceptfds, struct timeval *timeout) fd_set *exceptfds, struct timeval *tv)
{ {
HANDLE abort, mutex, signal, handle, *handles; HANDLE abort, mutex, signal, handle, *handles;
fd_set readsock, writesock, exceptsock; fd_set readsock, writesock, exceptsock;
@ -768,9 +768,17 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
return -1; return -1;
} }
/* convert struct timeval to milliseconds */
if(tv) {
milliseconds = (tv->tv_sec*1000)+(DWORD)(((double)tv->tv_usec)/1000.0);
}
else {
milliseconds = INFINITE;
}
/* check if we got descriptors, sleep in case we got none */ /* check if we got descriptors, sleep in case we got none */
if(!nfds) { if(!nfds) {
Sleep((timeout->tv_sec*1000)+(DWORD)(((double)timeout->tv_usec)/1000.0)); SleepEx(milliseconds, FALSE);
return 0; return 0;
} }
@ -906,14 +914,6 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
} }
} }
/* convert struct timeval to milliseconds */
if(timeout) {
milliseconds = ((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000));
}
else {
milliseconds = INFINITE;
}
/* wait for one of the internal handles to trigger */ /* wait for one of the internal handles to trigger */
wait = WaitForMultipleObjectsEx(nfd, handles, FALSE, milliseconds, FALSE); wait = WaitForMultipleObjectsEx(nfd, handles, FALSE, milliseconds, FALSE);
@ -981,13 +981,13 @@ static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
for(fds = 0; fds < nfds; fds++) { for(fds = 0; fds < nfds; fds++) {
if(FD_ISSET(fds, readfds)) if(FD_ISSET(fds, readfds))
logmsg("select_ws: %d is readable", fds); logmsg("[select_ws] %d is readable", fds);
if(FD_ISSET(fds, writefds)) if(FD_ISSET(fds, writefds))
logmsg("select_ws: %d is writable", fds); logmsg("[select_ws] %d is writable", fds);
if(FD_ISSET(fds, exceptfds)) if(FD_ISSET(fds, exceptfds))
logmsg("select_ws: %d is excepted", fds); logmsg("[select_ws] %d is exceptional", fds);
} }
for(idx = 0; idx < wsa; idx++) { for(idx = 0; idx < wsa; idx++) {