From a607f8a20c6c5ac869598753097e3da06165cbd9 Mon Sep 17 00:00:00 2001 From: Jay Satiro Date: Fri, 14 Nov 2014 03:59:46 -0500 Subject: examples: Don't call select() to sleep on windows Windows does not support using select() for sleeping without a dummy socket. Instead use Windows' Sleep() and sleep for 100ms which is the minimum suggested value in the curl_multi_fdset() doc. Prior to this change the multi examples would exit prematurely since select() would error instead of sleeping when called without an fd. Reported-by: Johan Lantz Bug: http://curl.haxx.se/mail/lib-2014-11/0221.html --- docs/examples/imap-multi.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) (limited to 'docs/examples/imap-multi.c') diff --git a/docs/examples/imap-multi.c b/docs/examples/imap-multi.c index 601205a08..c8c67ff87 100644 --- a/docs/examples/imap-multi.c +++ b/docs/examples/imap-multi.c @@ -88,6 +88,7 @@ int main(void) fd_set fdexcep; int maxfd = -1; int rc; + CURLMcode mc; /* curl_multi_fdset() return code */ long curl_timeo = -1; @@ -109,15 +110,32 @@ int main(void) timeout.tv_usec = (curl_timeo % 1000) * 1000; } - /* Get file descriptors from the transfers */ - curl_multi_fdset(mcurl, &fdread, &fdwrite, &fdexcep, &maxfd); + /* get file descriptors from the transfers */ + mc = curl_multi_fdset(mcurl, &fdread, &fdwrite, &fdexcep, &maxfd); - /* In a real-world program you OF COURSE check the return code of the - function calls. On success, the value of maxfd is guaranteed to be - greater or equal than -1. We call select(maxfd + 1, ...), specially in - case of (maxfd == -1), we call select(0, ...), which is basically equal - to sleep. */ - rc = select(maxfd + 1, &fdread, &fdwrite, &fdexcep, &timeout); + if(mc != CURLM_OK) + { + fprintf(stderr, "curl_multi_fdset() failed, code %d.\n", mc); + break; + } + + /* On success the value of maxfd is guaranteed to be >= -1. We call + select(maxfd + 1, ...); specially in case of (maxfd == -1) we call + select(0, ...), which is basically equal to sleeping the timeout. On + Windows we can't sleep via select without a dummy socket and instead + we Sleep() for 100ms which is the minimum suggested value in the + curl_multi_fdset() doc. */ + +#ifdef _WIN32 + if(maxfd == -1) { + Sleep(100); + rc = 0; + } + else +#endif + { + rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout); + } if(tvdiff(tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { fprintf(stderr, -- cgit v1.2.3