Add missing GUARDED_BY to CAddrMan::insecure_rand

This commit is contained in:
MarcoFalke 2021-07-22 20:56:27 +02:00
parent fab755b77f
commit fa32024d51
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
4 changed files with 6 additions and 4 deletions

View file

@ -631,12 +631,12 @@ protected:
uint256 nKey;
//! Source of random numbers for randomization in inner loops
mutable FastRandomContext insecure_rand;
mutable FastRandomContext insecure_rand GUARDED_BY(cs);
private:
//! A mutex to protect the inner data structures.
mutable Mutex cs;
private:
//! Serialization versions.
enum Format : uint8_t {
V0_HISTORICAL = 0, //!< historic format, before commit e6b343d88

View file

@ -34,6 +34,7 @@ public:
//! Ensure that bucket placement is always the same for testing purposes.
void MakeDeterministic()
{
LOCK(cs);
nKey.SetNull();
insecure_rand = FastRandomContext(true);
}
@ -87,11 +88,11 @@ public:
{
CAddrMan::Clear();
if (deterministic) {
LOCK(cs);
nKey.SetNull();
insecure_rand = FastRandomContext(true);
}
}
};
static CNetAddr ResolveIP(const std::string& ip)

View file

@ -27,7 +27,7 @@ class CAddrManDeterministic : public CAddrMan
public:
void MakeDeterministic(const uint256& random_seed)
{
insecure_rand = FastRandomContext{random_seed};
WITH_LOCK(cs, insecure_rand = FastRandomContext{random_seed});
Clear();
}
};

View file

@ -37,6 +37,7 @@ public:
//! Ensure that bucket placement is always the same for testing purposes.
void MakeDeterministic()
{
LOCK(cs);
nKey.SetNull();
insecure_rand = FastRandomContext(true);
}