Generalize a bit
This commit is contained in:
parent
dc0154ecd1
commit
8a8b306f3d
@ -44,9 +44,9 @@ public:
|
||||
Key _key;
|
||||
};
|
||||
|
||||
std::unique_ptr<Resource> add(const Key &key, std::unique_ptr<Resource> resource);
|
||||
std::unique_ptr<Resource> load(const Key &key);
|
||||
void remove(const Key &key, std::unique_ptr<Resource> block);
|
||||
std::unique_ptr<CachedResourceRef> add(const Key &key, std::unique_ptr<Resource> resource);
|
||||
std::unique_ptr<CachedResourceRef> load(const Key &key);
|
||||
void remove(const Key &key, std::unique_ptr<CachedResourceRef> block);
|
||||
|
||||
private:
|
||||
class OpenResource {
|
||||
@ -80,8 +80,8 @@ private:
|
||||
std::map<Key, OpenResource> _openResources;
|
||||
std::map<Key, std::promise<std::unique_ptr<Resource>>> _resourcesToRemove;
|
||||
|
||||
std::unique_ptr<Resource> _add(const Key &key, std::unique_ptr<Resource> resource);
|
||||
std::unique_ptr<Resource> _createCachedResourceRef(Resource *resource, const Key &key);
|
||||
std::unique_ptr<CachedResourceRef> _add(const Key &key, std::unique_ptr<Resource> resource);
|
||||
std::unique_ptr<CachedResourceRef> _createCachedResourceRef(Resource *resource, const Key &key);
|
||||
|
||||
void release(const Key &key);
|
||||
friend class CachedResource;
|
||||
@ -90,27 +90,27 @@ private:
|
||||
};
|
||||
|
||||
template<class Resource, class CachedResourceRef, class Key>
|
||||
std::unique_ptr<Resource> CachingStore<Resource, CachedResourceRef, Key>::add(const Key &key, std::unique_ptr<Resource> resource) {
|
||||
std::unique_ptr<CachedResourceRef> CachingStore<Resource, CachedResourceRef, Key>::add(const Key &key, std::unique_ptr<Resource> resource) {
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
return _add(key, std::move(resource));
|
||||
}
|
||||
|
||||
template<class Resource, class CachedResourceRef, class Key>
|
||||
std::unique_ptr<Resource> CachingStore<Resource, CachedResourceRef, Key>::_add(const Key &key, std::unique_ptr<Resource> resource) {
|
||||
std::unique_ptr<CachedResourceRef> CachingStore<Resource, CachedResourceRef, Key>::_add(const Key &key, std::unique_ptr<Resource> resource) {
|
||||
auto insertResult = _openResources.emplace(key, std::move(resource));
|
||||
assert(true == insertResult.second);
|
||||
return _createCachedResourceRef(insertResult.first->second.getReference(), key);
|
||||
}
|
||||
|
||||
template<class Resource, class CachedResourceRef, class Key>
|
||||
std::unique_ptr<Resource> CachingStore<Resource, CachedResourceRef, Key>::_createCachedResourceRef(Resource *resource, const Key &key) {
|
||||
std::unique_ptr<CachedResourceRef> CachingStore<Resource, CachedResourceRef, Key>::_createCachedResourceRef(Resource *resource, const Key &key) {
|
||||
auto resourceRef = std::make_unique<CachedResourceRef>(resource);
|
||||
resourceRef->init(this, key);
|
||||
return std::move(resourceRef);
|
||||
}
|
||||
|
||||
template<class Resource, class CachedResourceRef, class Key>
|
||||
std::unique_ptr<Resource> CachingStore<Resource, CachedResourceRef, Key>::load(const Key &key) {
|
||||
std::unique_ptr<CachedResourceRef> CachingStore<Resource, CachedResourceRef, Key>::load(const Key &key) {
|
||||
std::lock_guard<std::mutex> lock(_mutex);
|
||||
auto found = _openResources.find(key);
|
||||
if (found == _openResources.end()) {
|
||||
@ -125,7 +125,7 @@ std::unique_ptr<Resource> CachingStore<Resource, CachedResourceRef, Key>::load(c
|
||||
}
|
||||
|
||||
template<class Resource, class CachedResourceRef, class Key>
|
||||
void CachingStore<Resource, CachedResourceRef, Key>::remove(const Key &key, std::unique_ptr<Resource> resource) {
|
||||
void CachingStore<Resource, CachedResourceRef, Key>::remove(const Key &key, std::unique_ptr<CachedResourceRef> resource) {
|
||||
auto insertResult = _resourcesToRemove.emplace(key, std::promise<std::unique_ptr<Resource>>());
|
||||
assert(true == insertResult.second);
|
||||
resource.reset();
|
||||
|
Loading…
Reference in New Issue
Block a user