Add a flag to defer cache reads while the cache is being updated (#97)

This commit is contained in:
CJ Cobb
2022-02-18 20:44:07 -05:00
committed by GitHub
parent db601b587c
commit 199144d092
2 changed files with 32 additions and 19 deletions

View File

@@ -7,35 +7,41 @@ SimpleCache::update(
uint32_t seq, uint32_t seq,
bool isBackground) bool isBackground)
{ {
std::unique_lock lck{mtx_}; deferReads_ = true;
if (seq > latestSeq_)
{ {
assert(seq == latestSeq_ + 1 || latestSeq_ == 0); std::unique_lock lck{mtx_};
latestSeq_ = seq; if (seq > latestSeq_)
}
for (auto const& obj : objs)
{
if (obj.blob.size())
{ {
if (isBackground && deletes_.count(obj.key)) assert(seq == latestSeq_ + 1 || latestSeq_ == 0);
continue; latestSeq_ = seq;
auto& e = map_[obj.key]; }
if (seq > e.seq) for (auto const& obj : objs)
{
if (obj.blob.size())
{ {
e = {seq, obj.blob}; if (isBackground && deletes_.count(obj.key))
continue;
auto& e = map_[obj.key];
if (seq > e.seq)
{
e = {seq, obj.blob};
}
}
else
{
map_.erase(obj.key);
if (!full_ && !isBackground)
deletes_.insert(obj.key);
} }
} }
else
{
map_.erase(obj.key);
if (!full_ && !isBackground)
deletes_.insert(obj.key);
}
} }
deferReads_ = false;
} }
std::optional<LedgerObject> std::optional<LedgerObject>
SimpleCache::getSuccessor(ripple::uint256 const& key, uint32_t seq) const SimpleCache::getSuccessor(ripple::uint256 const& key, uint32_t seq) const
{ {
if (deferReads_)
return {};
if (!full_) if (!full_)
return {}; return {};
std::shared_lock{mtx_}; std::shared_lock{mtx_};
@@ -49,6 +55,8 @@ SimpleCache::getSuccessor(ripple::uint256 const& key, uint32_t seq) const
std::optional<LedgerObject> std::optional<LedgerObject>
SimpleCache::getPredecessor(ripple::uint256 const& key, uint32_t seq) const SimpleCache::getPredecessor(ripple::uint256 const& key, uint32_t seq) const
{ {
if (deferReads_)
return {};
if (!full_) if (!full_)
return {}; return {};
std::shared_lock lck{mtx_}; std::shared_lock lck{mtx_};
@@ -63,6 +71,8 @@ SimpleCache::getPredecessor(ripple::uint256 const& key, uint32_t seq) const
std::optional<Blob> std::optional<Blob>
SimpleCache::get(ripple::uint256 const& key, uint32_t seq) const SimpleCache::get(ripple::uint256 const& key, uint32_t seq) const
{ {
if (deferReads_)
return {};
if (seq > latestSeq_) if (seq > latestSeq_)
return {}; return {};
std::shared_lock lck{mtx_}; std::shared_lock lck{mtx_};

View File

@@ -19,6 +19,9 @@ class SimpleCache
}; };
std::map<ripple::uint256, CacheEntry> map_; std::map<ripple::uint256, CacheEntry> map_;
mutable std::shared_mutex mtx_; mutable std::shared_mutex mtx_;
// flag set in update to prevent reads from starving the update, and to
// prevent reads from piling up behind the update
std::atomic_bool deferReads_ = false;
uint32_t latestSeq_ = 0; uint32_t latestSeq_ = 0;
std::atomic_bool full_ = false; std::atomic_bool full_ = false;
// temporary set to prevent background thread from writing already deleted // temporary set to prevent background thread from writing already deleted