Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Any result #222

Closed
wants to merge 4 commits into from
Closed

Any result #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
326abcf
Added serializable AnyResult class
keceli Feb 4, 2022
dd6ea87
Use AnyResult in ModuleResult
keceli Feb 4, 2022
6670a97
Add serialization for Cache
keceli Feb 4, 2022
6b5a43c
Add unit tests
keceli Feb 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions include/pluginplay/cache/cache.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "pluginplay/detail_/any.hpp"
#include "pluginplay/detail_/any_result.hpp"
#include <pluginplay/hasher.hpp>

namespace pluginplay {
Expand Down Expand Up @@ -84,7 +84,7 @@ class Cache {
* @tparam KeyType The type of the object being used as a key. Must be
* hashable.
* @tparam ValueType The type of the data being stored. Must be
* type-erasable via an pluginplayAny.
* type-erasable via an AnyResult.
* @tparam <Anonymous> Template type parameter used to disable overload
* when @p KeyType is the same as `hash_type`.
*
Expand All @@ -109,7 +109,7 @@ class Cache {
* `hash_type`.
*
* @tparam ValueType The type of the data being stored. Must be
* type-erasable via an pluginplayAny.
* type-erasable via an AnyResult.
*
* @param[in] key The hash the data will be associated with.
* @param[in] value The data to store under the key.
Expand Down Expand Up @@ -375,9 +375,18 @@ class Cache {
*/
void reset_cache();

/** @brief Serialize/deserialize cache
*
* @param ar The archive object
*/
template<typename Archive>
void serialize(Archive& ar) {
ar& m_data_;
}

private:
/// The object actually storing all of the cached data
std::map<hash_type, pluginplay::detail_::Any> m_data_;
std::map<hash_type, pluginplay::detail_::AnyResult> m_data_;
/// The set storing the hash keys of temporary values in the cache
std::set<hash_type> m_temp_;
}; // class Cache
Expand All @@ -396,8 +405,8 @@ void Cache::cache(const KeyType& key, ValueType&& value, const CacheTag& tag) {
template<typename ValueType>
void Cache::cache(hash_type key, ValueType&& value, const CacheTag& tag) {
using clean_type = std::decay_t<ValueType>;
using pluginplay::detail_::make_Any;
auto da_any = make_Any<clean_type>(std::forward<ValueType>(value));
using pluginplay::detail_::make_AnyResult;
auto da_any = make_AnyResult<clean_type>(std::forward<ValueType>(value));
m_data_[key] = std::move(da_any);
if(tag == CacheTag::Temporary && !m_temp_.count(key)) m_temp_.insert(key);
}
Expand Down
Loading