tests: Add missing locking annotations and locks

practicalswift · furszy · commit d6e3ebe5cebd · 2021-04-15T17:38:03.000-03:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -37,7 +37,7 @@ struct COrphanTx {
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
-static RecursiveMutex g_cs_orphans;
+RecursiveMutex g_cs_orphans;
 std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);
 std::map<COutPoint, std::set<std::map<uint256, COrphanTx>::iterator, IteratorComparator>> mapOrphanTransactionsByPrev GUARDED_BY(g_cs_orphans);
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
@@ -33,7 +33,8 @@ struct COrphanTx {
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
-extern std::map<uint256, COrphanTx> mapOrphanTransactions;
+extern RecursiveMutex g_cs_orphans;
+extern std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);
 
 CService ip(uint32_t i)
 {
@@ -135,6 +136,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
 CTransactionRef RandomOrphan()
 {
     std::map<uint256, COrphanTx>::iterator it;
+    LOCK2(cs_main, g_cs_orphans);
     it = mapOrphanTransactions.lower_bound(InsecureRand256());
     if (it == mapOrphanTransactions.end())
         it = mapOrphanTransactions.begin();
@@ -220,6 +222,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         BOOST_CHECK(!AddOrphanTx(MakeTransactionRef(tx), i));
     }
 
+    LOCK2(cs_main, g_cs_orphans);
     // Test EraseOrphansFor:
     for (NodeId i = 0; i < 3; i++)
     {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ struct COrphanTx {`
`33`	`33`	`NodeId fromPeer;`
`34`	`34`	`int64_t nTimeExpire;`
`35`	`35`	`};`
`36`		`-extern std::map<uint256, COrphanTx> mapOrphanTransactions;`
	`36`	`+extern RecursiveMutex g_cs_orphans;`
	`37`	`+extern std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);`
`37`	`38`
`38`	`39`	`CService ip(uint32_t i)`
`39`	`40`	`{`
`@@ -135,6 +136,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)`
`135`	`136`	`CTransactionRef RandomOrphan()`
`136`	`137`	`{`
`137`	`138`	`std::map<uint256, COrphanTx>::iterator it;`
	`139`	`+ LOCK2(cs_main, g_cs_orphans);`
`138`	`140`	`it = mapOrphanTransactions.lower_bound(InsecureRand256());`
`139`	`141`	`if (it == mapOrphanTransactions.end())`
`140`	`142`	`it = mapOrphanTransactions.begin();`
`@@ -220,6 +222,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)`
`220`	`222`	`BOOST_CHECK(!AddOrphanTx(MakeTransactionRef(tx), i));`
`221`	`223`	`}`
`222`	`224`
	`225`	`+ LOCK2(cs_main, g_cs_orphans);`
`223`	`226`	`// Test EraseOrphansFor:`
`224`	`227`	`for (NodeId i = 0; i < 3; i++)`
`225`	`228`	`{`