Add RecursiveDynamicUsage overload for std::shared_ptr

ryanofsky · sdaftuar · commit 37a90f1ad0b5 · 2017-01-08T09:57:37.000-05:00
This simplifies a few usage expressions.
diff --git a/src/core_memusage.h b/src/core_memusage.h
@@ -63,4 +63,9 @@ static inline size_t RecursiveDynamicUsage(const CBlockLocator& locator) {
     return memusage::DynamicUsage(locator.vHave);
 }
 
+template<typename X>
+static inline size_t RecursiveDynamicUsage(const std::shared_ptr<X>& p) {
+    return RecursiveDynamicUsage(*p) + memusage::DynamicUsage(p);
+}
+
 #endif // BITCOIN_CORE_MEMUSAGE_H
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -30,7 +30,7 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFe
 {
     nTxWeight = GetTransactionWeight(*tx);
     nModSize = tx->CalculateModifiedSize(GetTxSize());
-    nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
+    nUsageSize = RecursiveDynamicUsage(tx);
 
     nCountWithDescendants = 1;
     nSizeWithDescendants = GetTxSize();
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -773,7 +773,7 @@ struct DisconnectedBlockTransactions {
     void addTransaction(CTransactionRef tx)
     {
         queuedTx.insert(tx);
-        cachedInnerUsage += RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);
+        cachedInnerUsage += RecursiveDynamicUsage(tx);
     }
 
     // Remove entries based on txid_index, and update memory usage.
@@ -782,7 +782,7 @@ struct DisconnectedBlockTransactions {
         for (auto const &tx : vtx) {
             auto it = queuedTx.find(tx->GetHash());
             if (it != queuedTx.end()) {
-                cachedInnerUsage -= RecursiveDynamicUsage(**it) + memusage::DynamicUsage(*it);
+                cachedInnerUsage -= RecursiveDynamicUsage(*it);
                 queuedTx.erase(it);
             }
         }
@@ -791,7 +791,7 @@ struct DisconnectedBlockTransactions {
     // Remove an entry by insertion_order index, and update memory usage.
     void removeEntry(indexed_disconnected_transactions::index<insertion_order>::type::iterator entry)
     {
-        cachedInnerUsage -= RecursiveDynamicUsage(**entry) + memusage::DynamicUsage(*entry);
+        cachedInnerUsage -= RecursiveDynamicUsage(*entry);
         queuedTx.get<insertion_order>().erase(entry);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -63,4 +63,9 @@ static inline size_t RecursiveDynamicUsage(const CBlockLocator& locator) {`
`63`	`63`	`return memusage::DynamicUsage(locator.vHave);`
`64`	`64`	`}`
`65`	`65`
	`66`	`+template<typename X>`
	`67`	`+static inline size_t RecursiveDynamicUsage(const std::shared_ptr<X>& p) {`
	`68`	`+ return RecursiveDynamicUsage(*p) + memusage::DynamicUsage(p);`
	`69`	`+}`
	`70`	`+`
`66`	`71`	`#endif // BITCOIN_CORE_MEMUSAGE_H`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& _tx, const CAmount& _nFe`
`30`	`30`	`{`
`31`	`31`	`nTxWeight = GetTransactionWeight(*tx);`
`32`	`32`	`nModSize = tx->CalculateModifiedSize(GetTxSize());`
`33`		`- nUsageSize = RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);`
	`33`	`+ nUsageSize = RecursiveDynamicUsage(tx);`
`34`	`34`
`35`	`35`	`nCountWithDescendants = 1;`
`36`	`36`	`nSizeWithDescendants = GetTxSize();`
Original file line number	Diff line number	Diff line change
`@@ -773,7 +773,7 @@ struct DisconnectedBlockTransactions {`
`773`	`773`	`void addTransaction(CTransactionRef tx)`
`774`	`774`	`{`
`775`	`775`	`queuedTx.insert(tx);`
`776`		`- cachedInnerUsage += RecursiveDynamicUsage(*tx) + memusage::DynamicUsage(tx);`
	`776`	`+ cachedInnerUsage += RecursiveDynamicUsage(tx);`
`777`	`777`	`}`
`778`	`778`
`779`	`779`	`// Remove entries based on txid_index, and update memory usage.`
`@@ -782,7 +782,7 @@ struct DisconnectedBlockTransactions {`
`782`	`782`	`for (auto const &tx : vtx) {`
`783`	`783`	`auto it = queuedTx.find(tx->GetHash());`
`784`	`784`	`if (it != queuedTx.end()) {`
`785`		`- cachedInnerUsage -= RecursiveDynamicUsage(*it) + memusage::DynamicUsage(it);`
	`785`	`+ cachedInnerUsage -= RecursiveDynamicUsage(*it);`
`786`	`786`	`queuedTx.erase(it);`
`787`	`787`	`}`
`788`	`788`	`}`
`@@ -791,7 +791,7 @@ struct DisconnectedBlockTransactions {`
`791`	`791`	`// Remove an entry by insertion_order index, and update memory usage.`
`792`	`792`	`void removeEntry(indexed_disconnected_transactions::index<insertion_order>::type::iterator entry)`
`793`	`793`	`{`
`794`		`- cachedInnerUsage -= RecursiveDynamicUsage(*entry) + memusage::DynamicUsage(entry);`
	`794`	`+ cachedInnerUsage -= RecursiveDynamicUsage(*entry);`
`795`	`795`	`queuedTx.get<insertion_order>().erase(entry);`
`796`	`796`	`}`
`797`	`797`