Fix Curl downloader not observing set task limits (axmolengine#2067)

* Delete unused variable * Remove invalid comment * Fix Curl downloader not observing set task limits
Joilnen · Aug 2, 2024 · 39b6560 · 39b6560
1 parent 807a91b
commit 39b6560
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/core/network/Downloader-curl.cpp b/core/network/Downloader-curl.cpp
@@ -52,7 +52,7 @@
 //   https://curl.se/libcurl/c/curl_easy_getinfo.html
 //   https://curl.se/libcurl/c/curl_easy_setopt.html
 
-#    define AX_CURL_POLL_TIMEOUT_MS 1000  // wait until DNS query done
+#    define AX_CURL_POLL_TIMEOUT_MS 1000
 
 enum
 {
@@ -611,7 +611,6 @@ class DownloaderCURL::Impl : public std::enable_shared_from_this<DownloaderCURL:
 
                         // remove from multi-handle
                         curl_multi_remove_handle(curlmHandle, curlHandle);
-                        bool reinited = false;
                         do
                         {
                             auto coTask = static_cast<DownloadTaskCURL*>(task->_coTask.get());
@@ -623,7 +622,7 @@ class DownloaderCURL::Impl : public std::enable_shared_from_this<DownloaderCURL:
                                     curl_easy_getinfo(curlHandle, CURLINFO_RESPONSE_CODE, &responeCode);
                                     fmt::format_to(std::back_inserter(errorMsg), FMT_COMPILE(": {}"), responeCode);
                                 }
-                                
+
                                 coTask->setErrorDesc(DownloadTask::ERROR_IMPL_INTERNAL, errCode, std::move(errorMsg));
                                 break;
                             }
@@ -669,9 +668,12 @@ class DownloaderCURL::Impl : public std::enable_shared_from_this<DownloaderCURL:
             }
 
             // process tasks in _requestList
-            auto size = coTaskMap.size();
-            while (0 == countOfMaxProcessingTasks || size < countOfMaxProcessingTasks)
+            while (true)
             {
+                // Check for set task limit
+                if (countOfMaxProcessingTasks && coTaskMap.size() >= countOfMaxProcessingTasks)
+                    break;
+
                 // get task wrapper from request queue
                 std::shared_ptr<DownloadTask> task;
                 {