From ea0ffd01256b22468e9e46d1afe2fcfd81ab8dcb Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 12 Jan 2015 11:37:00 -0800
Subject: [PATCH] Introduce reserveUnusedResource

---
 libraries/networking/src/ResourceCache.cpp | 25 +++++++++++++++-------
 libraries/networking/src/ResourceCache.h   |  1 +
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index 1b3d4cc232..e2fef26b22 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -73,15 +73,12 @@ QSharedPointer<Resource> ResourceCache::getResource(const QUrl& url, const QUrl&
 }
 
 void ResourceCache::addUnusedResource(const QSharedPointer<Resource>& resource) {
-    while (_unusedResourcesSize + resource->getBytesTotal() > _unusedResourcesMaxSize &&
-           !_unusedResources.empty()) {
-        // unload the oldest resource
-        QMap<int, QSharedPointer<Resource> >::iterator it = _unusedResources.begin();
-        
-        _unusedResourcesSize -= it.value()->getBytesTotal();
-        it.value()->setCache(NULL);
-        _unusedResources.erase(it);
+    if (resource->getBytesTotal() > _unusedResourcesMaxSize) {
+        // If it doesn't fit anyway, let's leave whatever is already in the cache.
+        resource->setCache(nullptr);
+        return;
     }
+    reserveUnusedResource(resource->getBytesTotal());
     
     resource->setLRUKey(++_lastLRUKey);
     _unusedResources.insert(resource->getLRUKey(), resource);
@@ -95,6 +92,18 @@ void ResourceCache::removeUnusedResource(const QSharedPointer<Resource>& resourc
     }
 }
 
+void ResourceCache::reserveUnusedResource(qint64 resourceSize) {
+    while (!_unusedResources.empty() &&
+           _unusedResourcesSize + resourceSize > _unusedResourcesMaxSize) {
+        // unload the oldest resource
+        QMap<int, QSharedPointer<Resource> >::iterator it = _unusedResources.begin();
+        
+        _unusedResourcesSize -= it.value()->getBytesTotal();
+        it.value()->setCache(NULL);
+        _unusedResources.erase(it);
+    }
+}
+
 void ResourceCache::attemptRequest(Resource* resource) {
     if (_requestLimit <= 0) {
         // wait until a slot becomes available
diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
index 90d228fb07..6ae8b22445 100644
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -65,6 +65,7 @@ protected:
     
     void addUnusedResource(const QSharedPointer<Resource>& resource);
     void removeUnusedResource(const QSharedPointer<Resource>& resource);
+    void reserveUnusedResource(qint64 resourceSize);
     
     static void attemptRequest(Resource* resource);
     static void requestCompleted(Resource* resource);