mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-07-22 19:18:33 +02:00
Merge pull request #7453 from Atlante45/fix/atp-req-limit
Make ATP respect request limit
This commit is contained in:
commit
f8f0e48af9
1 changed files with 7 additions and 13 deletions
|
@ -216,17 +216,13 @@ Resource* ResourceCacheSharedItems::getHighestPendingRequest() {
|
|||
bool ResourceCache::attemptRequest(Resource* resource) {
|
||||
auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>();
|
||||
|
||||
// Disable request limiting for ATP
|
||||
if (resource->getURL().scheme() != URL_SCHEME_ATP) {
|
||||
if (_requestsActive >= _requestLimit) {
|
||||
// wait until a slot becomes available
|
||||
sharedItems->appendPendingRequest(resource);
|
||||
return false;
|
||||
}
|
||||
|
||||
++_requestsActive;
|
||||
if (_requestsActive >= _requestLimit) {
|
||||
// wait until a slot becomes available
|
||||
sharedItems->appendPendingRequest(resource);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
++_requestsActive;
|
||||
sharedItems->appendActiveRequest(resource);
|
||||
resource->makeRequest();
|
||||
return true;
|
||||
|
@ -235,9 +231,7 @@ bool ResourceCache::attemptRequest(Resource* resource) {
|
|||
void ResourceCache::requestCompleted(Resource* resource) {
|
||||
auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>();
|
||||
sharedItems->removeRequest(resource);
|
||||
if (resource->getURL().scheme() != URL_SCHEME_ATP) {
|
||||
--_requestsActive;
|
||||
}
|
||||
--_requestsActive;
|
||||
|
||||
attemptHighestPriorityRequest();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue