From eeeafb324ef6057f40b5c5fdd8464110e809b0f7 Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Sun, 31 Jan 2021 23:50:53 +1000 Subject: [PATCH] net_processing: move AddToCompactExtraTransactions into PeerManagerImpl Allows making vExtraTxnForCompact and vExtraTxnForCompactIt member vars instead of globals. --- src/net_processing.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 98d9709eb2b..af61e7064e5 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -459,19 +459,21 @@ private: /** Storage for orphan information */ TxOrphanage m_orphanage; + + void AddToCompactExtraTransactions(const CTransactionRef& tx) EXCLUSIVE_LOCKS_REQUIRED(g_cs_orphans); + + /** Orphan/conflicted/etc transactions that are kept for compact block reconstruction. + * The last -blockreconstructionextratxn/DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN of + * these are kept in a ring buffer */ + std::vector> vExtraTxnForCompact GUARDED_BY(g_cs_orphans); + /** Offset into vExtraTxnForCompact to insert the next tx */ + size_t vExtraTxnForCompactIt GUARDED_BY(g_cs_orphans) = 0; }; } // namespace namespace { /** Number of preferable block download peers. */ int nPreferredDownload GUARDED_BY(cs_main) = 0; - - /** Orphan/conflicted/etc transactions that are kept for compact block reconstruction. - * The last -blockreconstructionextratxn/DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN of - * these are kept in a ring buffer */ - static std::vector> vExtraTxnForCompact GUARDED_BY(g_cs_orphans); - /** Offset into vExtraTxnForCompact to insert the next tx */ - static size_t vExtraTxnForCompactIt GUARDED_BY(g_cs_orphans) = 0; } // namespace namespace { @@ -1081,7 +1083,7 @@ bool PeerManagerImpl::GetNodeStateStats(NodeId nodeid, CNodeStateStats &stats) return true; } -static void AddToCompactExtraTransactions(const CTransactionRef& tx) EXCLUSIVE_LOCKS_REQUIRED(g_cs_orphans) +void PeerManagerImpl::AddToCompactExtraTransactions(const CTransactionRef& tx) { size_t max_extra_txn = gArgs.GetArg("-blockreconstructionextratxn", DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN); if (max_extra_txn <= 0)