Make the cache expiryDelay configurable

apps/openmw/mwworld/cellpreloader.cpp

@@ -123,6 +123,7 @@ namespace MWWorld
     CellPreloader::CellPreloader(Resource::ResourceSystem* resourceSystem, Resource::BulletShapeManager* bulletShapeManager)
         : mResourceSystem(resourceSystem)
         , mBulletShapeManager(bulletShapeManager)
+        , mExpiryDelay(0.0)
     {
         mWorkQueue = new SceneUtil::WorkQueue;
     }
@@ -156,13 +157,11 @@ namespace MWWorld
 
     void CellPreloader::updateCache(double timestamp)
     {
-        // time (in seconds) to keep a preloaded cell in cache after it's no longer needed
+        // TODO: add settings for a minimum/maximum size of the cache
-        // additionally we could support a minimum/maximum size for the cache
-        const double expiryTime = 60.0;
 
         for (PreloadMap::iterator it = mPreloadCells.begin(); it != mPreloadCells.end();)
         {
-            if (it->second.mTimeStamp < timestamp - expiryTime)
+            if (it->second.mTimeStamp < timestamp - mExpiryDelay)
                 mPreloadCells.erase(it++);
             else
                 ++it;
@@ -172,6 +171,11 @@ namespace MWWorld
         mWorkQueue->addWorkItem(new UpdateCacheItem(mResourceSystem, timestamp));
     }
 
+    void CellPreloader::setExpiryDelay(double expiryDelay)
+    {
+        mExpiryDelay = expiryDelay;
+    }
+
     void CellPreloader::setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue)
     {
         mWorkQueue = workQueue;

apps/openmw/mwworld/cellpreloader.hpp

@@ -27,12 +27,16 @@ namespace MWWorld
         /// Removes preloaded cells that have not had a preload request for a while.
         void updateCache(double timestamp);
 
+        /// How long to keep a preloaded cell in cache after it's no longer requested.
+        void setExpiryDelay(double expiryDelay);
+
         void setWorkQueue(osg::ref_ptr<SceneUtil::WorkQueue> workQueue);
 
     private:
         Resource::ResourceSystem* mResourceSystem;
         Resource::BulletShapeManager* mBulletShapeManager;
         osg::ref_ptr<SceneUtil::WorkQueue> mWorkQueue;
+        double mExpiryDelay;
 
         struct PreloadEntry
         {

apps/openmw/mwworld/scene.cpp

@@ -455,6 +455,10 @@ namespace MWWorld
     , mPreloadEnabled(Settings::Manager::getBool("preload enabled", "Cells"))
     {
         mPreloader.reset(new CellPreloader(rendering.getResourceSystem(), physics->getShapeManager()));
+
+        float cacheExpiryDelay = Settings::Manager::getFloat("cache expiry delay", "Cells");
+        rendering.getResourceSystem()->setExpiryDelay(cacheExpiryDelay);
+        mPreloader->setExpiryDelay(cacheExpiryDelay);
     }
 
     Scene::~Scene()

components/resource/niffilemanager.cpp

@@ -29,8 +29,7 @@ namespace Resource
     };
 
     NifFileManager::NifFileManager(const VFS::Manager *vfs)
-        : ResourceManager(vfs, 0.0) // NIF files aren't needed any more when the converted objects are cached in SceneManager / BulletShapeManager,
+        : ResourceManager(vfs)
-                                    // so we'll use expiryDelay of 0 to instantly delete NIF files after use.
     {
     }
 

components/resource/resourcemanager.cpp

@@ -5,10 +5,10 @@
 namespace Resource
 {
 
-    ResourceManager::ResourceManager(const VFS::Manager *vfs, const double expiryDelay)
+    ResourceManager::ResourceManager(const VFS::Manager *vfs)
         : mVFS(vfs)
         , mCache(new Resource::ObjectCache)
-        , mExpiryDelay(expiryDelay)
+        , mExpiryDelay(0.0)
     {
 
     }
@@ -26,6 +26,11 @@ namespace Resource
         mCache->clear();
     }
 
+    void ResourceManager::setExpiryDelay(double expiryDelay)
+    {
+        mExpiryDelay = expiryDelay;
+    }
+
     const VFS::Manager* ResourceManager::getVFS() const
     {
         return mVFS;

components/resource/resourcemanager.hpp

@@ -17,8 +17,7 @@ namespace Resource
     class ResourceManager
     {
     public:
-        /// @param expiryDelay how long to keep objects in cache after no longer being referenced.
+        ResourceManager(const VFS::Manager* vfs);
-        ResourceManager(const VFS::Manager* vfs, const double expiryDelay = 300.0);
 
         /// Clear cache entries that have not been referenced for longer than expiryDelay.
         virtual void updateCache(double referenceTime);
@@ -26,6 +25,9 @@ namespace Resource
         /// Clear all cache entries regardless of having external references.
         virtual void clearCache();
 
+        /// How long to keep objects in cache after no longer being referenced.
+        void setExpiryDelay (double expiryDelay);
+
         const VFS::Manager* getVFS() const;
 
     protected:

components/resource/resourcesystem.cpp

@@ -52,6 +52,16 @@ namespace Resource
         return mKeyframeManager.get();
     }
 
+    void ResourceSystem::setExpiryDelay(double expiryDelay)
+    {
+        for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)
+            (*it)->setExpiryDelay(expiryDelay);
+
+        // NIF files aren't needed any more once the converted objects are cached in SceneManager / BulletShapeManager,
+        // so no point in using an expiry delay
+        mNifFileManager->setExpiryDelay(0.0);
+    }
+
     void ResourceSystem::updateCache(double referenceTime)
     {
         for (std::vector<ResourceManager*>::iterator it = mResourceManagers.begin(); it != mResourceManagers.end(); ++it)

components/resource/resourcesystem.hpp

@@ -43,6 +43,9 @@ namespace Resource
         /// @note Does not delete resourceMgr.
         void removeResourceManager(ResourceManager* resourceMgr);
 
+        /// How long to keep objects in cache after no longer being referenced.
+        void setExpiryDelay(double expiryDelay);
+
         /// @note May be called from any thread.
         const VFS::Manager* getVFS() const;
 

files/settings-default.cfg

@@ -43,6 +43,10 @@ preload enabled = true
 # Preloading distance threshold
 preload distance = 1000
 
+# How long to keep preloaded cells and cached models/textures/collision shapes in cache
+# after they're no longer referenced/required (in seconds)
+cache expiry delay = 300
+
 [Map]
 
 # Size of each exterior cell in pixels in the world map. (e.g. 12 to 24).