refactor: Drop g_parallel_script_checks global

bitcoin · hebasto · Aug 21, 2020 · Aug 21, 2020 · Aug 21, 2020 · Aug 21, 2020
commit 56d40da18fb60641c6dd683f77837cd32c0e24dd
diff --git a/src/init.cpp b/src/init.cpp
@@ -1305,9 +1305,6 @@ bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockA
     script_threads = std::min(script_threads, MAX_SCRIPTCHECK_THREADS);
 
     LogPrintf("Script verification uses %d additional threads\n", script_threads);
-    if (script_threads >= 1) {
-        g_parallel_script_checks = true;
-    }
 
     assert(!node.scheduler);
     node.scheduler = MakeUnique<CScheduler>();

diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
@@ -144,9 +144,8 @@ TestingSetup::TestingSetup(const std::string& chainName, const std::vector<const
     m_node.mempool = MakeUnique<CTxMemPool>(&::feeEstimator);
     m_node.mempool->setSanityCheck(1.0);
 
-    // Start script-checking threads. Set g_parallel_script_checks to true so they are used.
+    // Start script-checking threads.
     constexpr int script_check_threads = 2;
-    g_parallel_script_checks = true;
     m_node.chainman = &::g_chainman;
     m_node.chainman->InitializeChainstate(*m_node.mempool, uint256(), script_check_threads);
     ::ChainstateActive().InitCoinsDB(

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -132,7 +132,6 @@ CBlockIndex *pindexBestHeader = nullptr;
 Mutex g_best_block_mutex;
 std::condition_variable g_best_block_cv;
 uint256 g_best_block;
-bool g_parallel_script_checks{false};
 std::atomic_bool fImporting(false);
 std::atomic_bool fReindex(false);
 bool fHavePruned = false;
@@ -1266,6 +1265,7 @@ void CoinsViews::InitCache()
 CChainState::CChainState(CTxMemPool& mempool, BlockManager& blockman, uint256 from_snapshot_blockhash, int script_check_worker_threads)
     : m_blockman(blockman),
       m_mempool(mempool),
+      m_parallel_script_checks{script_check_worker_threads > 0},
       m_script_check_queue{MakeUnique<CCheckQueue<CScriptCheck>>(128 /* batch size */, script_check_worker_threads)},
       m_from_snapshot_blockhash(from_snapshot_blockhash)
 {
@@ -2119,7 +2119,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
     // in multiple threads). Preallocate the vector size so a new allocation
     // doesn't invalidate pointers into the vector, and keep txsdata in scope
     // for as long as `control`.
-    CCheckQueueControl<CScriptCheck> control(fScriptChecks && g_parallel_script_checks ? m_script_check_queue.get() : nullptr);
+    CCheckQueueControl<CScriptCheck> control(fScriptChecks && m_parallel_script_checks ? m_script_check_queue.get() : nullptr);
     std::vector<PrecomputedTransactionData> txsdata(block.vtx.size());
 
     std::vector<int> prevheights;
@@ -2178,7 +2178,7 @@ bool CChainState::ConnectBlock(const CBlock& block, BlockValidationState& state,
             std::vector<CScriptCheck> vChecks;
             bool fCacheResults = fJustCheck; /* Don't cache results if we're actually connecting blocks (still consult the cache, though) */
             TxValidationState tx_state;
-            if (fScriptChecks && !CheckInputScripts(tx, tx_state, view, flags, fCacheResults, fCacheResults, txsdata[i], g_parallel_script_checks ? &vChecks : nullptr)) {
+            if (fScriptChecks && !CheckInputScripts(tx, tx_state, view, flags, fCacheResults, fCacheResults, txsdata[i], m_parallel_script_checks ? &vChecks : nullptr)) {
                 // Any transaction validation failure in ConnectBlock is a block consensus failure
                 state.Invalid(BlockValidationResult::BLOCK_CONSENSUS,
                               tx_state.GetRejectReason(), tx_state.GetDebugMessage());

diff --git a/src/validation.h b/src/validation.h
@@ -118,10 +118,6 @@ extern std::condition_variable g_best_block_cv;
 extern uint256 g_best_block;
 extern std::atomic_bool fImporting;
 extern std::atomic_bool fReindex;
-/** Whether there are dedicated script-checking threads running.
- * False indicates all script checking is done on the main threadMessageHandler thread.
- */
-extern bool g_parallel_script_checks;
 extern bool fRequireStandard;
 extern bool fCheckBlockIndex;
 extern bool fCheckpointsEnabled;
@@ -542,6 +538,9 @@ class CChainState {
     //! Manages the UTXO set, which is a reflection of the contents of `m_chain`.
     std::unique_ptr<CoinsViews> m_coins_views;
 
+    //! Whether there are dedicated script-checking worker threads running.
+    //! False indicates all script checking is done on the main threadMessageHandler thread.
+    const bool m_parallel_script_checks;
     const std::unique_ptr<CCheckQueue<CScriptCheck>> m_script_check_queue;
 
 public: