Merge #14108: tests: Add missing locking annotations and locks (g_cs_orphans)

MarcoFalke · MarcoFalke · commit bdbd654df8dd · 2018-08-31T08:32:31.000-04:00
b602c9b tests: Add missing locking annotations and locks (practicalswift) Pull request description: Add missing locking annotations and locks. `mapOrphanTransactions` is guarded by `g_cs_orphans`. Tree-SHA512: f95104fbef23bd385e754c6bea3c3bdddd8a9c6a68e719d761227c9be1e46ff1316ec050a15a1243218dbab4e8584da6674f4a72f949f54b0a758392f19c83f8
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -70,7 +70,7 @@ struct COrphanTx {
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
-static CCriticalSection g_cs_orphans;
+CCriticalSection g_cs_orphans;
 std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);
 
 void EraseOrphansFor(NodeId peer);
diff --git a/src/test/denialofservice_tests.cpp b/src/test/denialofservice_tests.cpp
@@ -31,7 +31,8 @@ struct COrphanTx {
     NodeId fromPeer;
     int64_t nTimeExpire;
 };
-extern std::map<uint256, COrphanTx> mapOrphanTransactions;
+extern CCriticalSection g_cs_orphans;
+extern std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);
 
 static CService ip(uint32_t i)
 {
@@ -324,7 +325,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)
 static CTransactionRef RandomOrphan()
 {
     std::map<uint256, COrphanTx>::iterator it;
-    LOCK(cs_main);
+    LOCK2(cs_main, g_cs_orphans);
     it = mapOrphanTransactions.lower_bound(InsecureRand256());
     if (it == mapOrphanTransactions.end())
         it = mapOrphanTransactions.begin();
@@ -394,7 +395,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)
         BOOST_CHECK(!AddOrphanTx(MakeTransactionRef(tx), i));
     }
 
-    LOCK(cs_main);
+    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
`@@ -31,7 +31,8 @@ struct COrphanTx {`
`31`	`31`	`NodeId fromPeer;`
`32`	`32`	`int64_t nTimeExpire;`
`33`	`33`	`};`
`34`		`-extern std::map<uint256, COrphanTx> mapOrphanTransactions;`
	`34`	`+extern CCriticalSection g_cs_orphans;`
	`35`	`+extern std::map<uint256, COrphanTx> mapOrphanTransactions GUARDED_BY(g_cs_orphans);`
`35`	`36`
`36`	`37`	`static CService ip(uint32_t i)`
`37`	`38`	`{`
`@@ -324,7 +325,7 @@ BOOST_AUTO_TEST_CASE(DoS_bantime)`
`324`	`325`	`static CTransactionRef RandomOrphan()`
`325`	`326`	`{`
`326`	`327`	`std::map<uint256, COrphanTx>::iterator it;`
`327`		`- LOCK(cs_main);`
	`328`	`+ LOCK2(cs_main, g_cs_orphans);`
`328`	`329`	`it = mapOrphanTransactions.lower_bound(InsecureRand256());`
`329`	`330`	`if (it == mapOrphanTransactions.end())`
`330`	`331`	`it = mapOrphanTransactions.begin();`
`@@ -394,7 +395,7 @@ BOOST_AUTO_TEST_CASE(DoS_mapOrphans)`
`394`	`395`	`BOOST_CHECK(!AddOrphanTx(MakeTransactionRef(tx), i));`
`395`	`396`	`}`
`396`	`397`
`397`		`- LOCK(cs_main);`
	`398`	`+ LOCK2(cs_main, g_cs_orphans);`
`398`	`399`	`// Test EraseOrphansFor:`
`399`	`400`	`for (NodeId i = 0; i < 3; i++)`
`400`	`401`	`{`