Add missing GUARDED_BY to CAddrMan::insecure_rand

This commit is contained in:
MarcoFalke committed 2021-07-23 11:31:05 +02:00
1 parent fab755b77f
commit fa32024d51
4 files changed
+6 -4

No files matched your search

+2 -2
View File
@@ -631,12 +631,12 @@ protected:
uint256 nKey; uint256 nKey;
//! Source of random numbers for randomization in inner loops //! 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. //! A mutex to protect the inner data structures.
mutable Mutex cs; mutable Mutex cs;
private:
//! Serialization versions. //! Serialization versions.
enum Format : uint8_t { enum Format : uint8_t {
V0_HISTORICAL = 0, //!< historic format, before commit e6b343d88 V0_HISTORICAL = 0, //!< historic format, before commit e6b343d88
+2 -1
View File
@@ -34,6 +34,7 @@ public:
//! Ensure that bucket placement is always the same for testing purposes. //! Ensure that bucket placement is always the same for testing purposes.
void MakeDeterministic() void MakeDeterministic()
{ {
LOCK(cs);
nKey.SetNull(); nKey.SetNull();
insecure_rand = FastRandomContext(true); insecure_rand = FastRandomContext(true);
} }
@@ -87,11 +88,11 @@ public:
{ {
CAddrMan::Clear(); CAddrMan::Clear();
if (deterministic) { if (deterministic) {
LOCK(cs);
nKey.SetNull(); nKey.SetNull();
insecure_rand = FastRandomContext(true); insecure_rand = FastRandomContext(true);
} }
} }
}; };
static CNetAddr ResolveIP(const std::string& ip) static CNetAddr ResolveIP(const std::string& ip)
+1 -1
View File
@@ -27,7 +27,7 @@ class CAddrManDeterministic : public CAddrMan
public: public:
void MakeDeterministic(const uint256& random_seed) void MakeDeterministic(const uint256& random_seed)
{ {
insecure_rand = FastRandomContext{random_seed}; WITH_LOCK(cs, insecure_rand = FastRandomContext{random_seed});
Clear(); Clear();
} }
}; };
+1
View File
@@ -37,6 +37,7 @@ public:
//! Ensure that bucket placement is always the same for testing purposes. //! Ensure that bucket placement is always the same for testing purposes.
void MakeDeterministic() void MakeDeterministic()
{ {
LOCK(cs);
nKey.SetNull(); nKey.SetNull();
insecure_rand = FastRandomContext(true); insecure_rand = FastRandomContext(true);
} }