tiamak/p2pool-salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better cache cleanup

Browse Source
This commit is contained in:
SChernykh
2022-10-04 17:51:40 +02:00
parent eabf856dbd
commit 45674ef554
4 changed files with 142 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/crypto.cpp
View File

@@ -158,6 +158,9 @@ class Cache
{
public:
Cache()
: derivations(new DerivationsMap())
, public_keys(new PublicKeysMap())
, tx_keys(new TxKeysMap())
{
uv_rwlock_init_checked(&derivations_lock);
uv_rwlock_init_checked(&public_keys_lock);
@@ -166,6 +169,10 @@ public:
~Cache()
{
delete derivations;
delete public_keys;
delete tx_keys;
uv_rwlock_destroy(&derivations_lock);
uv_rwlock_destroy(&public_keys_lock);
uv_rwlock_destroy(&tx_keys_lock);
@@ -180,8 +187,8 @@ public:
derivation = {};
{
ReadLock lock(derivations_lock);
auto it = derivations.find(index);
if (it != derivations.end()) {
auto it = derivations->find(index);
if (it != derivations->end()) {
const DerivationEntry& entry = it->second;
derivation = entry.m_derivation;
if (entry.find_view_tag(output_index, view_tag)) {
@@ -210,7 +217,7 @@ public:
{
WriteLock lock(derivations_lock);
DerivationEntry& entry = derivations.emplace(index, DerivationEntry{ derivation, {} }).first->second;
DerivationEntry& entry = derivations->emplace(index, DerivationEntry{ derivation, {} }).first->second;
const uint32_t k = static_cast<uint32_t>(output_index << 8) | view_tag;
if (std::find(entry.m_viewTags.begin(), entry.m_viewTags.end(), k) == entry.m_viewTags.end()) {
@@ -230,8 +237,8 @@ public:
{
ReadLock lock(public_keys_lock);
auto it = public_keys.find(index);
if (it != public_keys.end()) {
auto it = public_keys->find(index);
if (it != public_keys->end()) {
derived_key = it->second;
return true;
}
@@ -257,7 +264,7 @@ public:
{
WriteLock lock(public_keys_lock);
public_keys.emplace(index, derived_key);
public_keys->emplace(index, derived_key);
}
return true;
@@ -271,8 +278,8 @@ public:
{
ReadLock lock(tx_keys_lock);
auto it = tx_keys.find(index);
if (it != tx_keys.end()) {
auto it = tx_keys->find(index);
if (it != tx_keys->end()) {
pub = it->second.first;
sec = it->second.second;
return;
@@ -291,15 +298,27 @@ public:
{
WriteLock lock(tx_keys_lock);
tx_keys.emplace(index, std::pair<hash, hash>(pub, sec));
tx_keys->emplace(index, std::pair<hash, hash>(pub, sec));
}
}
void clear()
{
{ WriteLock lock(derivations_lock); derivations.clear(); }
{ WriteLock lock(public_keys_lock); public_keys.clear(); }
{ WriteLock lock(tx_keys_lock); tx_keys.clear(); }
{
WriteLock lock(derivations_lock);
delete derivations;
derivations = new DerivationsMap();
}
{
WriteLock lock(public_keys_lock);
delete public_keys;
public_keys = new PublicKeysMap();
}
{
WriteLock lock(tx_keys_lock);
delete tx_keys;
tx_keys = new TxKeysMap();
}
}
private:
@@ -319,14 +338,18 @@ private:
}
};
typedef unordered_map<std::array<uint8_t, HASH_SIZE * 2>, DerivationEntry> DerivationsMap;
typedef unordered_map<std::array<uint8_t, HASH_SIZE * 2 + sizeof(size_t)>, hash> PublicKeysMap;
typedef unordered_map<std::array<uint8_t, HASH_SIZE * 2>, std::pair<hash, hash>> TxKeysMap;
uv_rwlock_t derivations_lock;
unordered_map<std::array<uint8_t, HASH_SIZE * 2>, DerivationEntry> derivations;
DerivationsMap* derivations;
uv_rwlock_t public_keys_lock;
unordered_map<std::array<uint8_t, HASH_SIZE * 2 + sizeof(size_t)>, hash> public_keys;
PublicKeysMap* public_keys;
uv_rwlock_t tx_keys_lock;
unordered_map<std::array<uint8_t, HASH_SIZE * 2>, std::pair<hash, hash>> tx_keys;
TxKeysMap* tx_keys;
};
static Cache* cache = nullptr;
@@ -379,7 +402,9 @@ void destroy_crypto_cache()
void clear_crypto_cache()
{
cache->clear();
if (cache) {
cache->clear();
}
}
} // namespace p2pool