Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 14:14:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7453 from Atlante45/fix/atp-req-limit

Browse source 
Make ATP respect request limit
This commit is contained in:
Philip Rosedale 2016-03-24 09:20:30 -07:00
commit f8f0e48af9
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/networking/src/ResourceCache.cpp
View file

@ -216,8 +216,6 @@ Resource* ResourceCacheSharedItems::getHighestPendingRequest() {
bool ResourceCache::attemptRequest(Resource* resource) { bool ResourceCache::attemptRequest(Resource* resource) {
auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>(); auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>();
// Disable request limiting for ATP
if (resource->getURL().scheme() != URL_SCHEME_ATP) {
if (_requestsActive >= _requestLimit) { if (_requestsActive >= _requestLimit) {
// wait until a slot becomes available // wait until a slot becomes available
sharedItems->appendPendingRequest(resource); sharedItems->appendPendingRequest(resource);
@ -225,8 +223,6 @@ bool ResourceCache::attemptRequest(Resource* resource) {
} }
++_requestsActive; ++_requestsActive;
}
sharedItems->appendActiveRequest(resource); sharedItems->appendActiveRequest(resource);
resource->makeRequest(); resource->makeRequest();
return true; return true;
@ -235,9 +231,7 @@ bool ResourceCache::attemptRequest(Resource* resource) {
void ResourceCache::requestCompleted(Resource* resource) { void ResourceCache::requestCompleted(Resource* resource) {
auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>(); auto sharedItems = DependencyManager::get<ResourceCacheSharedItems>();
sharedItems->removeRequest(resource); sharedItems->removeRequest(resource);
if (resource->getURL().scheme() != URL_SCHEME_ATP) {
--_requestsActive; --_requestsActive;
}
attemptHighestPriorityRequest(); attemptHighestPriorityRequest();
} }