livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19533 Removed per-run limit 

Doesn't seem to work like expected and I never get more than 7-9 requests running total
meow-7.2.2
Andrey Kleshchev 2023-04-27 21:32:17 +03:00
parent 7bb5644969
commit 377f177a86
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -624,9 +624,6 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
return;
}
// Don't fire all requests at once
const U32 max_requests_this_run = llmin(mFetchCount + 5, max_concurrent_fetches);
// Don't loop for too long (in case of large, fully loaded inventory)
F64 curent_time = LLTimer::getTotalSeconds();
const F64 max_time = LLStartUp::getStartupState() > STATE_WEARABLES_WAIT
@ -635,7 +632,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
const F64 end_time = curent_time + max_time;
S32 last_fetch_count = mFetchCount;
while (!mFetchFolderQueue.empty() && mFetchCount < max_requests_this_run && curent_time < end_time)
while (!mFetchFolderQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
{
const FetchQueueInfo & fetch_info(mFetchFolderQueue.front());
bulkFetchViaAis(fetch_info);
@ -646,7 +643,7 @@ void LLInventoryModelBackgroundFetch::bulkFetchViaAis()
// Ideally we shouldn't fetch items if recursive fetch isn't done,
// but there is a chance some request will start timeouting and recursive
// fetch will get stuck on a signle folder, don't block item fetch in such case
while (!mFetchItemQueue.empty() && mFetchCount < max_requests_this_run && curent_time < end_time)
while (!mFetchItemQueue.empty() && mFetchCount < max_concurrent_fetches && curent_time < end_time)
{
const FetchQueueInfo& fetch_info(mFetchItemQueue.front());
bulkFetchViaAis(fetch_info);