From a2ab576768442f669040837c7f0667e672cf7d48 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 29 Jul 2019 08:50:25 +0200 Subject: [PATCH] curl: avoid uncessary libcurl timeouts (in parallel mode) When curl_multi_wait() returns OK without file descriptors to wait for, it might already have done a long timeout. Closes #4159 --- src/tool_operate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/tool_operate.c b/src/tool_operate.c index 68cd11c56..18adf1046 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -1972,14 +1972,17 @@ static CURLcode parallel_transfers(struct GlobalConfig *global, while(!done && !mcode && still_running) { int numfds; + struct timeval before = tvnow(); + long delta; mcode = curl_multi_wait(multi, NULL, 0, 1000, &numfds); + delta = tvdiff(tvnow(), before); if(!mcode) { - if(!numfds) { + if(!numfds && (delta < 30)) { long sleep_ms; - /* If it returns without any filedescriptor instantly, we need to + /* If it returns without any file descriptor instantly, we need to avoid busy-looping during periods where it has nothing particular to wait for */ curl_multi_timeout(multi, &sleep_ms);