From b22b6bb6b16fcc0d908aa7899a80650ec1fe511d Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Mon, 25 Oct 2010 17:33:38 +0200
Subject: Fixed a locking issue with regard to texture cache purging.

Releasing a lock in the middle of a critical area isn't very smart.
---
 linden/indra/newview/lltexturecache.cpp | 20 +++++++++++++-------
 linden/indra/newview/lltexturecache.h   |  1 +
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index ae0a63f..56f3719 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -1225,9 +1225,7 @@ void LLTextureCache::readHeaderCache()
 			{
 				for (std::set<LLUUID>::iterator iter = purge_list.begin(); iter != purge_list.end(); ++iter)
 				{
-					mHeaderMutex.unlock(); 
-					removeFromCache(*iter);
-					mHeaderMutex.lock();
+					removeFromCacheLocked(*iter);
 				}
 				// If we removed any entries, we need to rebuild the entries list,
 				// write the header, and call this again
@@ -1246,7 +1244,7 @@ void LLTextureCache::readHeaderCache()
 				writeEntriesAndClose(new_entries);
 				mHeaderMutex.unlock(); // unlock the mutex before calling again
 				readHeaderCache(); // repeat with new entries file
-				mHeaderMutex.lock();
+				return;
 			}
 			else
 			{
@@ -1611,7 +1609,6 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
 {
 	if (!mReadOnly)
 	{
-		LLMutexLock lock(&mHeaderMutex);
 		Entry entry;
 		S32 idx = openAndReadEntry(id, entry, false);
 		if (idx >= 0)
@@ -1628,17 +1625,26 @@ bool LLTextureCache::removeHeaderCacheEntry(const LLUUID& id)
 	return false;
 }
 
-void LLTextureCache::removeFromCache(const LLUUID& id)
+void LLTextureCache::removeFromCacheLocked(const LLUUID& id)
 {
 	//llwarns << "Removing texture from cache: " << id << llendl;
 	if (!mReadOnly)
 	{
 		removeHeaderCacheEntry(id);
-		LLMutexLock lock(&mHeaderMutex);
 		LLAPRFile::remove(getTextureFileName(id));
 	}
 }
 
+void LLTextureCache::removeFromCache(const LLUUID& id)
+{
+	//llwarns << "Removing texture from cache: " << id << llendl;
+	if (!mReadOnly)
+	{
+		LLMutexLock lock(&mHeaderMutex);
+		LLTextureCache::removeFromCacheLocked(id);
+	}
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLTextureCache::ReadResponder::ReadResponder()
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 45804c2..c859b9a 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -158,6 +158,7 @@ private:
 	S32 getHeaderCacheEntry(const LLUUID& id, S32& imagesize);
 	S32 setHeaderCacheEntry(const LLUUID& id, S32 imagesize);
 	bool removeHeaderCacheEntry(const LLUUID& id);
+	void removeFromCacheLocked(const LLUUID& id);
 	
 private:
 	// Internal
-- 
cgit v1.1