examples: add curl_multi_timeout
Make the multi-interface using examples use curl_multi_timeout to properly educate users how to do things.
This commit is contained in:
		
				
					committed by
					
						
						Daniel Stenberg
					
				
			
			
				
	
			
			
			
						parent
						
							157e6d4e7e
						
					
				
				
					commit
					bc0699f226
				
			@@ -144,6 +144,8 @@ fill_buffer(URL_FILE *file,int want,int waittime)
 | 
			
		||||
    do
 | 
			
		||||
    {
 | 
			
		||||
        int maxfd = -1;
 | 
			
		||||
        long curl_timeo = -1;
 | 
			
		||||
 | 
			
		||||
        FD_ZERO(&fdread);
 | 
			
		||||
        FD_ZERO(&fdwrite);
 | 
			
		||||
        FD_ZERO(&fdexcep);
 | 
			
		||||
@@ -152,6 +154,15 @@ fill_buffer(URL_FILE *file,int want,int waittime)
 | 
			
		||||
        timeout.tv_sec = 60; /* 1 minute */
 | 
			
		||||
        timeout.tv_usec = 0;
 | 
			
		||||
 | 
			
		||||
        curl_multi_timeout(multi_handle, &curl_timeo);
 | 
			
		||||
        if(curl_timeo >= 0) {
 | 
			
		||||
          timeout.tv_sec = curl_timeo / 1000;
 | 
			
		||||
          if(timeout.tv_sec > 1)
 | 
			
		||||
            timeout.tv_sec = 1;
 | 
			
		||||
          else
 | 
			
		||||
            timeout.tv_usec = (curl_timeo % 1000) * 1000;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /* get file descriptors from the transfers */
 | 
			
		||||
        curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -68,6 +68,8 @@ int main(int argc, char **argv)
 | 
			
		||||
    fd_set fdexcep;
 | 
			
		||||
    int maxfd = -1;
 | 
			
		||||
 | 
			
		||||
    long curl_timeo = -1;
 | 
			
		||||
 | 
			
		||||
    FD_ZERO(&fdread);
 | 
			
		||||
    FD_ZERO(&fdwrite);
 | 
			
		||||
    FD_ZERO(&fdexcep);
 | 
			
		||||
@@ -76,6 +78,15 @@ int main(int argc, char **argv)
 | 
			
		||||
    timeout.tv_sec = 1;
 | 
			
		||||
    timeout.tv_usec = 0;
 | 
			
		||||
 | 
			
		||||
    curl_multi_timeout(multi_handle, &curl_timeo);
 | 
			
		||||
    if(curl_timeo >= 0) {
 | 
			
		||||
      timeout.tv_sec = curl_timeo / 1000;
 | 
			
		||||
      if(timeout.tv_sec > 1)
 | 
			
		||||
        timeout.tv_sec = 1;
 | 
			
		||||
      else
 | 
			
		||||
        timeout.tv_usec = (curl_timeo % 1000) * 1000;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* get file descriptors from the transfers */
 | 
			
		||||
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -142,6 +142,8 @@ int main(int argc, char **argv)
 | 
			
		||||
    fd_set fdexcep;
 | 
			
		||||
    int maxfd = -1;
 | 
			
		||||
 | 
			
		||||
    long curl_timeo = -1;
 | 
			
		||||
 | 
			
		||||
    FD_ZERO(&fdread);
 | 
			
		||||
    FD_ZERO(&fdwrite);
 | 
			
		||||
    FD_ZERO(&fdexcep);
 | 
			
		||||
@@ -150,6 +152,15 @@ int main(int argc, char **argv)
 | 
			
		||||
    timeout.tv_sec = 1;
 | 
			
		||||
    timeout.tv_usec = 0;
 | 
			
		||||
 | 
			
		||||
    curl_multi_timeout(multi_handle, &curl_timeo);
 | 
			
		||||
    if(curl_timeo >= 0) {
 | 
			
		||||
      timeout.tv_sec = curl_timeo / 1000;
 | 
			
		||||
      if(timeout.tv_sec > 1)
 | 
			
		||||
        timeout.tv_sec = 1;
 | 
			
		||||
      else
 | 
			
		||||
        timeout.tv_usec = (curl_timeo % 1000) * 1000;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* get file descriptors from the transfers */
 | 
			
		||||
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -59,6 +59,8 @@ int main(int argc, char **argv)
 | 
			
		||||
    fd_set fdexcep;
 | 
			
		||||
    int maxfd = -1;
 | 
			
		||||
 | 
			
		||||
    long curl_timeo = -1;
 | 
			
		||||
 | 
			
		||||
    FD_ZERO(&fdread);
 | 
			
		||||
    FD_ZERO(&fdwrite);
 | 
			
		||||
    FD_ZERO(&fdexcep);
 | 
			
		||||
@@ -67,6 +69,15 @@ int main(int argc, char **argv)
 | 
			
		||||
    timeout.tv_sec = 1;
 | 
			
		||||
    timeout.tv_usec = 0;
 | 
			
		||||
 | 
			
		||||
    curl_multi_timeout(multi_handle, &curl_timeo);
 | 
			
		||||
    if(curl_timeo >= 0) {
 | 
			
		||||
      timeout.tv_sec = curl_timeo / 1000;
 | 
			
		||||
      if(timeout.tv_sec > 1)
 | 
			
		||||
        timeout.tv_sec = 1;
 | 
			
		||||
      else
 | 
			
		||||
        timeout.tv_usec = (curl_timeo % 1000) * 1000;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* get file descriptors from the transfers */
 | 
			
		||||
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -79,6 +79,8 @@ int main(int argc, char *argv[])
 | 
			
		||||
      fd_set fdexcep;
 | 
			
		||||
      int maxfd = -1;
 | 
			
		||||
 | 
			
		||||
      long curl_timeo = -1;
 | 
			
		||||
 | 
			
		||||
      FD_ZERO(&fdread);
 | 
			
		||||
      FD_ZERO(&fdwrite);
 | 
			
		||||
      FD_ZERO(&fdexcep);
 | 
			
		||||
@@ -87,6 +89,15 @@ int main(int argc, char *argv[])
 | 
			
		||||
      timeout.tv_sec = 1;
 | 
			
		||||
      timeout.tv_usec = 0;
 | 
			
		||||
 | 
			
		||||
      curl_multi_timeout(multi_handle, &curl_timeo);
 | 
			
		||||
      if(curl_timeo >= 0) {
 | 
			
		||||
        timeout.tv_sec = curl_timeo / 1000;
 | 
			
		||||
        if(timeout.tv_sec > 1)
 | 
			
		||||
          timeout.tv_sec = 1;
 | 
			
		||||
        else
 | 
			
		||||
          timeout.tv_usec = (curl_timeo % 1000) * 1000;
 | 
			
		||||
      }
 | 
			
		||||
 | 
			
		||||
      /* get file descriptors from the transfers */
 | 
			
		||||
      curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -53,6 +53,8 @@ int main(int argc, char **argv)
 | 
			
		||||
    fd_set fdexcep;
 | 
			
		||||
    int maxfd = -1;
 | 
			
		||||
 | 
			
		||||
    long curl_timeo = -1;
 | 
			
		||||
 | 
			
		||||
    FD_ZERO(&fdread);
 | 
			
		||||
    FD_ZERO(&fdwrite);
 | 
			
		||||
    FD_ZERO(&fdexcep);
 | 
			
		||||
@@ -61,6 +63,15 @@ int main(int argc, char **argv)
 | 
			
		||||
    timeout.tv_sec = 1;
 | 
			
		||||
    timeout.tv_usec = 0;
 | 
			
		||||
 | 
			
		||||
    curl_multi_timeout(multi_handle, &curl_timeo);
 | 
			
		||||
    if(curl_timeo >= 0) {
 | 
			
		||||
      timeout.tv_sec = curl_timeo / 1000;
 | 
			
		||||
      if(timeout.tv_sec > 1)
 | 
			
		||||
        timeout.tv_sec = 1;
 | 
			
		||||
      else
 | 
			
		||||
        timeout.tv_usec = (curl_timeo % 1000) * 1000;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /* get file descriptors from the transfers */
 | 
			
		||||
    curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user