mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-15 06:56:34 +00:00
Code Issues Releases Wiki Activity

Use struct for GenericObjectCache items

Browse source
This commit is contained in:
elsid 2023-08-27 16:03:14 +02:00
parent 5f4bd498cf
commit 915a8df942
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
1 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
components/resource/objectcache.hpp
View file

@ -62,9 +62,9 @@ namespace Resource
{ {
// If ref count is greater than 1, the object has an external reference. // If ref count is greater than 1, the object has an external reference.
// If the timestamp is yet to be initialized, it needs to be updated too. // If the timestamp is yet to be initialized, it needs to be updated too.
if ((itr->second.first != nullptr && itr->second.first->referenceCount() > 1) if ((itr->second.mValue != nullptr && itr->second.mValue->referenceCount() > 1)
|| itr->second.second == 0.0) || itr->second.mLastUsage == 0.0)
itr->second.second = referenceTime; itr->second.mLastUsage = referenceTime;
} }
} }
@ -81,10 +81,10 @@ namespace Resource
typename ObjectCacheMap::iterator oitr = _objectCache.begin(); typename ObjectCacheMap::iterator oitr = _objectCache.begin();
while (oitr != _objectCache.end()) while (oitr != _objectCache.end())
{ {
if (oitr->second.second <= expiryTime) if (oitr->second.mLastUsage <= expiryTime)
{ {
if (oitr->second.mValue != nullptr) if (oitr->second.mValue != nullptr)
objectsToRemove.push_back(std::move(oitr->second.first)); objectsToRemove.push_back(std::move(oitr->second.mValue));
_objectCache.erase(oitr++); _objectCache.erase(oitr++);
} }
else else
@ -106,7 +106,7 @@ namespace Resource
void addEntryToObjectCache(const KeyType& key, osg::Object* object, double timestamp = 0.0) void addEntryToObjectCache(const KeyType& key, osg::Object* object, double timestamp = 0.0)
{ {
std::lock_guard<std::mutex> lock(_objectCacheMutex); std::lock_guard<std::mutex> lock(_objectCacheMutex);
_objectCache[key] = ObjectTimeStampPair(object, timestamp); _objectCache[key] = Item{ object, timestamp };
} }
/** Remove Object from cache.*/ /** Remove Object from cache.*/
@ -124,7 +124,7 @@ namespace Resource
std::lock_guard<std::mutex> lock(_objectCacheMutex); std::lock_guard<std::mutex> lock(_objectCacheMutex);
typename ObjectCacheMap::iterator itr = _objectCache.find(key); typename ObjectCacheMap::iterator itr = _objectCache.find(key);
if (itr != _objectCache.end()) if (itr != _objectCache.end())
return itr->second.first; return itr->second.mValue;
else else
return nullptr; return nullptr;
} }
@ -135,7 +135,7 @@ namespace Resource
const auto it = _objectCache.find(key); const auto it = _objectCache.find(key);
if (it == _objectCache.end()) if (it == _objectCache.end())
return std::nullopt; return std::nullopt;
return it->second.first; return it->second.mValue;
} }
/** Check if an object is in the cache, and if it is, update its usage time stamp. */ /** Check if an object is in the cache, and if it is, update its usage time stamp. */
@ -145,7 +145,7 @@ namespace Resource
typename ObjectCacheMap::iterator itr = _objectCache.find(key); typename ObjectCacheMap::iterator itr = _objectCache.find(key);
if (itr != _objectCache.end()) if (itr != _objectCache.end())
{ {
itr->second.second = timeStamp; itr->second.mLastUsage = timeStamp;
return true; return true;
} }
else else
@ -158,7 +158,7 @@ namespace Resource
std::lock_guard<std::mutex> lock(_objectCacheMutex); std::lock_guard<std::mutex> lock(_objectCacheMutex);
for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr) for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
{ {
osg::Object* object = itr->second.first.get(); osg::Object* object = itr->second.mValue.get();
object->releaseGLObjects(state); object->releaseGLObjects(state);
} }
} }
@ -169,8 +169,7 @@ namespace Resource
std::lock_guard<std::mutex> lock(_objectCacheMutex); std::lock_guard<std::mutex> lock(_objectCacheMutex);
for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr) for (typename ObjectCacheMap::iterator itr = _objectCache.begin(); itr != _objectCache.end(); ++itr)
{ {
osg::Object* object = itr->second.first.get(); if (osg::Object* object = itr->second.mValue.get())
if (object)
{ {
osg::Node* node = dynamic_cast<osg::Node*>(object); osg::Node* node = dynamic_cast<osg::Node*>(object);
if (node) if (node)
@ -185,7 +184,7 @@ namespace Resource
{ {
std::lock_guard<std::mutex> lock(_objectCacheMutex); std::lock_guard<std::mutex> lock(_objectCacheMutex);
for (typename ObjectCacheMap::iterator it = _objectCache.begin(); it != _objectCache.end(); ++it) for (typename ObjectCacheMap::iterator it = _objectCache.begin(); it != _objectCache.end(); ++it)
f(it->first, it->second.first.get()); f(it->first, it->second.mValue.get());
} }
/** Get the number of objects in the cache. */ /** Get the number of objects in the cache. */
@ -202,14 +201,19 @@ namespace Resource
const auto it = _objectCache.lower_bound(std::forward<K>(key)); const auto it = _objectCache.lower_bound(std::forward<K>(key));
if (it == _objectCache.end()) if (it == _objectCache.end())
return std::nullopt; return std::nullopt;
return std::pair(it->first, it->second.first); return std::pair(it->first, it->second.mValue);
} }
protected: protected:
struct Item
{
osg::ref_ptr<osg::Object> mValue;
double mLastUsage;
};
virtual ~GenericObjectCache() {} virtual ~GenericObjectCache() {}
typedef std::pair<osg::ref_ptr<osg::Object>, double> ObjectTimeStampPair; using ObjectCacheMap = std::map<KeyType, Item, std::less<>>;
typedef std::map<KeyType, ObjectTimeStampPair, std::less<>> ObjectCacheMap;
ObjectCacheMap _objectCache; ObjectCacheMap _objectCache;
mutable std::mutex _objectCacheMutex; mutable std::mutex _objectCacheMutex;