moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 17:18:48 -05:00
Code Issues Releases Wiki Activity

curl: make sure the parallel transfers do them all

Browse Source 
The logic could erroneously break the loop too early before all
transfers had been transferred.

Reported-by: Tom van der Woerdt
Fixes #4316
Closes #4317
This commit is contained in:
Daniel Stenberg 2019-09-10 13:37:38 +02:00
parent 9637dbfffd
commit bbde0407d1
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/tool_operate.c
View File

@ -1924,12 +1924,21 @@ static CURLcode create_transfers(struct GlobalConfig *global,
static long all_added; /* number of easy handles currently added */ static long all_added; /* number of easy handles currently added */
/*
* add_parallel_transfers() sets 'morep' to TRUE if there are more transfers
* to add even after this call returns. sets 'addedp' to TRUE if one or more
* transfers were added.
*/
static int add_parallel_transfers(struct GlobalConfig *global, static int add_parallel_transfers(struct GlobalConfig *global,
CURLM *multi) CURLM *multi,
bool *morep,
bool *addedp)
{ {
struct per_transfer *per; struct per_transfer *per;
CURLcode result; CURLcode result;
CURLMcode mcode; CURLMcode mcode;
*addedp = FALSE;
*morep = FALSE;
for(per = transfers; per && (all_added < global->parallel_max); for(per = transfers; per && (all_added < global->parallel_max);
per = per->next) { per = per->next) {
if(per->added) if(per->added)
@ -1949,7 +1958,9 @@ static int add_parallel_transfers(struct GlobalConfig *global,
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
per->added = TRUE; per->added = TRUE;
all_added++; all_added++;
*addedp = TRUE;
} }
*morep = per ? TRUE : FALSE;
return CURLE_OK; return CURLE_OK;
} }
@ -1962,16 +1973,19 @@ static CURLcode parallel_transfers(struct GlobalConfig *global,
CURLcode result = CURLE_OK; CURLcode result = CURLE_OK;
int still_running = 1; int still_running = 1;
struct timeval start = tvnow(); struct timeval start = tvnow();
bool more_transfers;
bool added_transfers;
multi = curl_multi_init(); multi = curl_multi_init();
if(!multi) if(!multi)
return CURLE_OUT_OF_MEMORY; return CURLE_OUT_OF_MEMORY;
result = add_parallel_transfers(global, multi); result = add_parallel_transfers(global, multi,
&more_transfers, &added_transfers);
if(result) if(result)
return result; return result;
while(!done && !mcode && still_running) { while(!done && !mcode && (still_running || more_transfers)) {
mcode = curl_multi_poll(multi, NULL, 0, 1000, NULL); mcode = curl_multi_poll(multi, NULL, 0, 1000, NULL);
if(!mcode) if(!mcode)
mcode = curl_multi_perform(multi, &still_running); mcode = curl_multi_perform(multi, &still_running);
@ -2001,9 +2015,14 @@ static CURLcode parallel_transfers(struct GlobalConfig *global,
(void)del_transfer(ended); (void)del_transfer(ended);
} }
} while(msg); } while(msg);
if(removed) if(removed) {
/* one or more transfers completed, add more! */ /* one or more transfers completed, add more! */
(void)add_parallel_transfers(global, multi); (void)add_parallel_transfers(global, multi, &more_transfers,
&added_transfers);
if(added_transfers)
/* we added new ones, make sure the loop doesn't exit yet */
still_running = 1;
}
} }
} }