From eea02be70ee37b845f2719b3c08e5baf4b6f51f6 Mon Sep 17 00:00:00 2001 From: practicalswift Date: Sat, 19 Jan 2019 14:49:29 +0100 Subject: Add locking annotation for vNodes. vNodes is guarded by cs_vNodes. --- src/net.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/net.h b/src/net.h index 430e148afa..bb567ad2c4 100644 --- a/src/net.h +++ b/src/net.h @@ -177,7 +177,18 @@ public: CConnman(uint64_t seed0, uint64_t seed1); ~CConnman(); bool Start(CScheduler& scheduler, const Options& options); - void Stop(); + + // TODO: Remove NO_THREAD_SAFETY_ANALYSIS. Lock cs_vNodes before reading the variable vNodes. + // + // When removing NO_THREAD_SAFETY_ANALYSIS be aware of the following lock order requirements: + // * CheckForStaleTipAndEvictPeers locks cs_main before indirectly calling GetExtraOutboundCount + // which locks cs_vNodes. + // * ProcessMessage locks cs_main and g_cs_orphans before indirectly calling ForEachNode which + // locks cs_vNodes. + // + // Thus the implicit locking order requirement is: (1) cs_main, (2) g_cs_orphans, (3) cs_vNodes. + void Stop() NO_THREAD_SAFETY_ANALYSIS; + void Interrupt(); bool GetNetworkActive() const { return fNetworkActive; }; bool GetUseAddrmanOutgoing() const { return m_use_addrman_outgoing; }; @@ -418,7 +429,7 @@ private: CCriticalSection cs_vOneShots; std::vector vAddedNodes GUARDED_BY(cs_vAddedNodes); CCriticalSection cs_vAddedNodes; - std::vector vNodes; + std::vector vNodes GUARDED_BY(cs_vNodes); std::list vNodesDisconnected; mutable CCriticalSection cs_vNodes; std::atomic nLastNodeId{0}; -- cgit v1.2.3