4 files changed, 104 insertions, 26 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2cc6cca..5564136 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,3 +3,19 @@
         * linden/indra/newview/llviewerjointattachment.h (LLViewerJoint): 
         VWR-2685: Possible crash in bounding box (getBoundingBoxAgent())
         from hud attachments.
+
+2008-09-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/lltexturecache.cpp (purgeTextureFilesTimeSliced):
+        Skip "N files scheduled for deletion" message when nothing scheduled.
+
+2008-09-16  Nicholaz Beresford  <nicholaz@blueflash.cc>
+
+        * linden/indra/newview/lltexturecache.cpp:
+        VWR-3878: Purging cache textures causes viewer to pause for many
+        seconds, with heavy disk activity.
+        * linden/indra/newview/lltexturecache.h:
+        Ditto.
+
+        * linden/indra/llmessage/llassetstorage.cpp:
+        VWR-3877: A nasty possible memory overwrite and two minor leaks.
diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index a6077e5..83026ba 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -515,16 +515,19 @@ void LLAssetStorage::downloadCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data, LLExtStat ext_status)
+        void* callback_parm_req, LLExtStat ext_status)
 {
         lldebugs << "LLAssetStorage::downloadCompleteCallback() for " << file_id
                  << "," << LLAssetType::lookup(file_type) << llendl;
-        LLAssetRequest* req = (LLAssetRequest*)user_data;
+
+        // be careful! req may be a ptr to memory already freed (a timeout does this)
+        LLAssetRequest* req = (LLAssetRequest*)callback_parm_req;       
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadCompleteCallback called without"
                         "a valid request." << llendl;
-                return;
+                // we can live with a null pointer, we're not allowed to deref the ptr anyway (see above)
+                // return;  
         }
         if (!gAssetStorage)
         {
@@ -532,12 +535,10 @@ void LLAssetStorage::downloadCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset " << req->getUUID() << llendl;
@@ -556,7 +557,7 @@ void LLAssetStorage::downloadCompleteCallback(
         {
                 request_list_t::iterator curiter = iter++;
                 LLAssetRequest* tmp = *curiter;
-                if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
+                if ((tmp->getUUID() == file_id) && (tmp->getType() == file_type))
                 {
                         requests.push_front(tmp);
                         iter = gAssetStorage->mPendingDownloads.erase(curiter);
@@ -569,7 +570,7 @@ void LLAssetStorage::downloadCompleteCallback(
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mDownCallback)
                 {
-                        tmp->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), tmp->mUserData, result, ext_status);
+                        tmp->mDownCallback(gAssetStorage->mVFS, tmp->getUUID(), tmp->getType(), tmp->mUserData, result, ext_status);
                 }
                 delete tmp;
         }
@@ -665,10 +666,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data,
+        void* callback_parm_req,
         LLExtStat ext_status)
 {
-        LLEstateAssetRequest *req = (LLEstateAssetRequest*)user_data;
+        LLEstateAssetRequest *req = (LLEstateAssetRequest*)callback_parm_req;
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
@@ -682,12 +683,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getAType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
@@ -697,7 +696,9 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getAType(), req->mUserData, result, ext_status);
+        req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
+
+        delete req;
 }
 
 void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,
@@ -802,10 +803,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data,
+        void* callback_parm_req,
         LLExtStat ext_status)
 {
-        LLInvItemRequest *req = (LLInvItemRequest*)user_data;
+        LLInvItemRequest *req = (LLInvItemRequest*)callback_parm_req;
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
@@ -818,12 +819,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
@@ -833,7 +832,9 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), req->mUserData, result, ext_status);
+        req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
+
+        delete req;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index 22cb6c1..ac956e2 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -881,6 +881,8 @@ LLTextureCache::LLTextureCache(bool threaded)
 
 LLTextureCache::~LLTextureCache()
 {
+        purgeTextureFilesTimeSliced(TRUE); // force-flush all pending file deletes
+
         apr_pool_destroy(mFileAPRPool);
 }
 
@@ -1187,7 +1189,7 @@ void LLTextureCache::purgeTextures(bool validate)
                 return;
         }
         
-        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Reading Entries..." << LL_ENDL;
+        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Reading " << num_entries << " Entries from " << mTexturesDirEntriesFileName << LL_ENDL;
         
         std::map<LLUUID, S32> entry_idx_map;
         S64 total_size = 0;
@@ -1216,7 +1218,7 @@ void LLTextureCache::purgeTextures(bool validate)
                 LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
         }
         
-        S64 min_cache_size = (sCacheMaxTexturesSize * 9) / 10;
+        S64 min_cache_size = sCacheMaxTexturesSize / 100 * 95;
         S32 purge_count = 0;
         S32 next_idx = 0;
         for (S32 idx=0; idx<num_entries; idx++)
@@ -1250,8 +1252,8 @@ void LLTextureCache::purgeTextures(bool validate)
                 if (purge_entry)
                 {
                         purge_count++;
-                        LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
-                        ll_apr_file_remove(filename, NULL);
+                        LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
+                        mFilesToDelete.push_back(filename);
                         total_size -= entries[idx].mSize;
                         entries[idx].mSize = 0;
                 }
@@ -1266,7 +1268,11 @@ void LLTextureCache::purgeTextures(bool validate)
         }
         num_entries = next_idx;
 
-        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " << num_entries << LL_ENDL;
+        mTimeLastFileDelete.reset();
+
+        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " 
+                << num_entries << " (" << num_entries*sizeof(Entry)/1024 << "KB)"
+                << LL_ENDL;
         
         ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
         ll_apr_file_write_ex(mTexturesDirEntriesFileName, NULL,
@@ -1289,10 +1295,56 @@ void LLTextureCache::purgeTextures(bool validate)
         LL_INFOS("TextureCache") << "TEXTURE CACHE:"
                         << " PURGED: " << purge_count
                         << " ENTRIES: " << num_entries
-                        << " CACHE SIZE: " << total_size / 1024*1024 << " MB"
+                        << " CACHE SIZE: " << total_size/1024/1024 << " MB"
                         << llendl;
 }
 
+
+void LLTextureCache::purgeTextureFilesTimeSliced(BOOL force_all)
+{
+        LLMutexLock lock(&mHeaderMutex);
+
+        F32 delay_between_passes = 1.0f; // seconds
+        F32 max_time_per_pass = 0.1f; // seconds
+
+        if (!force_all && mTimeLastFileDelete.getElapsedTimeF32() <= delay_between_passes) 
+        {
+                return;
+        }
+
+        LLTimer timer;
+        S32 howmany = 0;
+
+        if (mFilesToDelete.size() > 0)
+        {
+                llinfos << "TEXTURE CACHE: " << mFilesToDelete.size() << " files scheduled for deletion" << llendl;
+        }
+
+        for (LLTextureCache::filename_list_t::iterator iter = mFilesToDelete.begin(); iter!=mFilesToDelete.end(); ) 
+        {       
+                LLTextureCache::filename_list_t::iterator iter2 = iter++;
+                ll_apr_file_remove(*iter2, NULL);
+                mFilesToDelete.erase(iter2);
+                howmany++;
+
+                if (!force_all && timer.getElapsedTimeF32() > max_time_per_pass) 
+                {
+                        break;
+                }
+        }
+
+        if (!mFilesToDelete.empty())
+        {
+                llinfos << "TEXTURE CACHE: "<< howmany << " files deleted (" 
+                                << mFilesToDelete.size() << " files left for next pass)" 
+                                << llendl;
+        }
+
+        mTimeLastFileDelete.reset();
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////
 
 // call lockWorkers() first!
@@ -1462,6 +1514,10 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
                 purgeTextures(false);
                 mDoPurge = FALSE;
         }
+
+        purgeTextureFilesTimeSliced();  // purge textures from cache in a non-hiccup-way
+
+
         if (datasize >= TEXTURE_CACHE_ENTRY_SIZE)
         {
                 LLMutexLock lock(&mWorkersMutex);
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index f083dd0..e15a88b 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -119,6 +119,7 @@ private:
         void readHeaderCache(apr_pool_t* poolp = NULL);
         void purgeAllTextures(bool purge_directories);
         void purgeTextures(bool validate);
+        void purgeTextureFilesTimeSliced(BOOL force_all = FALSE);
         S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL);
         bool removeHeaderCacheEntry(const LLUUID& id);
         void lockHeaders() { mHeaderMutex.lock(); }
@@ -140,6 +141,10 @@ private:
 
         typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
         responder_list_t mCompletedList;
+
+        typedef std::list<std::string> filename_list_t;
+        filename_list_t mFilesToDelete;
+        LLTimer mTimeLastFileDelete;
         
         BOOL mReadOnly;