From 64e7be0321e9505a31ef7f2533976cef80e8ed38 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 9 Dec 2013 08:35:21 +0100
Subject: [PATCH] This should make the cache-full situation a lot more benign

I should be ashamed of myself, i took ugly, terrible code and uglied it up even more.
---
 indra/newview/llpanelnetwork.cpp |  7 +-----
 indra/newview/lltexturecache.cpp | 39 ++++++++++++++++++++++++++++----
 indra/newview/lltexturecache.h   |  1 +
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/indra/newview/llpanelnetwork.cpp b/indra/newview/llpanelnetwork.cpp
index 95b91731b..05821a8a8 100644
--- a/indra/newview/llpanelnetwork.cpp
+++ b/indra/newview/llpanelnetwork.cpp
@@ -118,12 +118,7 @@ LLPanelNetwork::~LLPanelNetwork()
 
 void LLPanelNetwork::apply()
 {
-	U32 cache_size = (U32)childGetValue("cache_size").asInteger();
-	if (gSavedSettings.getU32("CacheSize") != cache_size)
-	{
-		onClickClearCache(this);
-		gSavedSettings.setU32("CacheSize", cache_size);
-	}
+	gSavedSettings.setU32("CacheSize", childGetValue("cache_size").asInteger());
 	gSavedSettings.setF32("ThrottleBandwidthKBPS", childGetValue("max_bandwidth").asReal());
 	gSavedSettings.setF32("HTTPThrottleBandwidth", childGetValue("tex_bandwidth").asReal());
 	gSavedSettings.setBOOL("ImagePipelineUseHTTP", childGetValue("http_textures"));
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp
index bb2b9c539..31bf42abd 100644
--- a/indra/newview/lltexturecache.cpp
+++ b/indra/newview/lltexturecache.cpp
@@ -51,6 +51,8 @@ const S32 TEXTURE_CACHE_ENTRY_SIZE = FIRST_PACKET_SIZE;//1024;
 const F32 TEXTURE_CACHE_PURGE_AMOUNT = .20f; // % amount to reduce the cache by when it exceeds its limit
 const F32 TEXTURE_CACHE_LRU_SIZE = .10f; // % amount for LRU list (low overhead to regenerate)
 
+static std::queue<LLUUID> sgDelayedPurgeQueue;
+
 class LLTextureCacheWorker : public LLWorkerClass
 {
 	friend class LLTextureCache;
@@ -1541,6 +1543,20 @@ void LLTextureCache::purgeAllTextures(bool purge_directories)
 	llinfos << "The entire texture cache is cleared." << llendl;
 }
 
+void LLTextureCache::performDelayedPurge()
+{
+	LLMutexLock lock(&mHeaderMutex);
+	while(!sgDelayedPurgeQueue.empty())
+	{
+		removeFromCache(sgDelayedPurgeQueue.front());
+		sgDelayedPurgeQueue.pop();
+		if (mTexturesSizeTotal < sCacheMaxTexturesSize)
+		{
+			break;
+		}
+	}
+}
+
 void LLTextureCache::purgeTextures(bool validate)
 {
 	if (mReadOnly)
@@ -1558,6 +1574,9 @@ void LLTextureCache::purgeTextures(bool validate)
 
 	llinfos << "TEXTURE CACHE: Purging." << llendl;
 
+	std::queue<LLUUID> empty;
+	std::swap(sgDelayedPurgeQueue, empty);
+
 	// Read the entries list
 	std::vector<Entry> entries;
 	U32 num_entries = openAndReadEntries(entries);
@@ -1567,8 +1586,8 @@ void LLTextureCache::purgeTextures(bool validate)
 	}
 	
 	// Use mTexturesSizeMap to collect UUIDs of textures with bodies
-	typedef std::set<std::pair<U32,S32> > time_idx_set_t;
-	std::set<std::pair<U32,S32> > time_idx_set;
+	typedef std::vector<std::pair<U32,S32> > time_idx_set_t;
+	time_idx_set_t time_idx_set;
 	for (size_map_t::iterator iter1 = mTexturesSizeMap.begin();
 		 iter1 != mTexturesSizeMap.end(); ++iter1)
 	{
@@ -1578,7 +1597,7 @@ void LLTextureCache::purgeTextures(bool validate)
 			if (iter2 != mHeaderIDMap.end())
 			{
 				S32 idx = iter2->second;
-				time_idx_set.insert(std::make_pair(entries[idx].mTime, idx));
+				time_idx_set.push_back(std::make_pair(entries[idx].mTime, idx));
 // 				llinfos << "TIME: " << entries[idx].mTime << " TEX: " << entries[idx].mID << " IDX: " << idx << " Size: " << entries[idx].mImageSize << llendl;
 			}
 			else
@@ -1587,6 +1606,8 @@ void LLTextureCache::purgeTextures(bool validate)
 			}
 		}
 	}
+
+	std::sort(time_idx_set.begin(), time_idx_set.end());
 	
 	// Validate 1/256th of the files on startup
 	U32 validate_idx = 0;
@@ -1637,7 +1658,14 @@ void LLTextureCache::purgeTextures(bool validate)
 			purge_count++;
 	 		LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
 			cache_size -= entries[idx].mBodySize;
-			removeEntry(idx, entries[idx], filename) ;			
+			if(validate)
+			{
+				removeEntry(idx, entries[idx], filename);
+			}
+			else
+			{
+				sgDelayedPurgeQueue.push(entries[idx].mID);
+			}
 		}
 	}
 
@@ -1791,7 +1819,7 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
 		delete responder;
 		return LLWorkerThread::nullHandle();
 	}
-	if (mDoPurge)
+	if (sgDelayedPurgeQueue.empty() && mDoPurge)
 	{
 		// NOTE: This may cause an occasional hiccup,
 		//  but it really needs to be done on the control thread
@@ -1799,6 +1827,7 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
 		purgeTextures(false);
 		mDoPurge = FALSE;
 	}
+	performDelayedPurge();
 	LLMutexLock lock(&mWorkersMutex);
 	LLTextureCacheWorker* worker = new LLTextureCacheRemoteWorker(this, priority, id,
 																  data, datasize, 0,
diff --git a/indra/newview/lltexturecache.h b/indra/newview/lltexturecache.h
index ac6ac0227..2715ef2c4 100644
--- a/indra/newview/lltexturecache.h
+++ b/indra/newview/lltexturecache.h
@@ -146,6 +146,7 @@ private:
 	void setDirNames(ELLPath location);
 	void readHeaderCache();
 	void clearCorruptedCache();
+	void performDelayedPurge();
 	void purgeAllTextures(bool purge_directories);
 	void purgeTextures(bool validate);
 	LLAPRFile* openHeaderEntriesFile(bool readonly, S32 offset);