Merge #15474: rest/rpc: Make mempoolinfo atomic

MarcoFalke · MarcoFalke · commit e2b5fdee0068 · 2019-04-17T10:30:38.000-04:00
e377846 rest/rpc: Make mempoolinfo atomic (João Barbosa) Pull request description: Make `/rest/mempool/info.json` endpoint and `getmempoolinfo` RPC atomic. ACKs for commit e37784: Tree-SHA512: 6b40844df813e180d68731fc263bd9a2c2a01fe143a4f5a8974e3e0023e6e2e1e9bc46669ddfdf44f0e47142feda2a2aad1ea02ef8837081e11522347f314b0b
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -1487,6 +1487,8 @@ static UniValue getchaintips(const JSONRPCRequest& request)
 
 UniValue MempoolInfoToJSON(const CTxMemPool& pool)
 {
+    // Make sure this call is atomic in the pool.
+    LOCK(pool.cs);
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("size", (int64_t)pool.size());
     ret.pushKV("bytes", (int64_t)pool.GetTotalTxSize());

Original file line number	Diff line number	Diff line change
`@@ -1487,6 +1487,8 @@ static UniValue getchaintips(const JSONRPCRequest& request)`
`1487`	`1487`
`1488`	`1488`	`UniValue MempoolInfoToJSON(const CTxMemPool& pool)`
`1489`	`1489`	`{`
	`1490`	`+ // Make sure this call is atomic in the pool.`
	`1491`	`+ LOCK(pool.cs);`
`1490`	`1492`	`UniValue ret(UniValue::VOBJ);`
`1491`	`1493`	`ret.pushKV("size", (int64_t)pool.size());`
`1492`	`1494`	`ret.pushKV("bytes", (int64_t)pool.GetTotalTxSize());`