aboutsummaryrefslogtreecommitdiff
path: root/src/validation.cpp
diff options
context:
space:
mode:
authorPieter Wuille <pieter.wuille@gmail.com>2018-04-03 21:53:07 -0700
committerPieter Wuille <pieter.wuille@gmail.com>2018-04-03 21:53:27 -0700
commit4a6c0e3dcfdca98270cb96b73db4c3d4446dba50 (patch)
tree144d60525f085531ef71883d6d3a25f680d405db /src/validation.cpp
parent45dd13503918e75a45ce33eb5c934b998790fdc8 (diff)
downloadbitcoin-4a6c0e3dcfdca98270cb96b73db4c3d4446dba50.tar.xz
Modernize best block mutex/cv/hash variable naming
Diffstat (limited to 'src/validation.cpp')
-rw-r--r--src/validation.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index c3e411f1fc..9dda65923b 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -202,9 +202,9 @@ CCriticalSection cs_main;
BlockMap& mapBlockIndex = g_chainstate.mapBlockIndex;
CChain& chainActive = g_chainstate.chainActive;
CBlockIndex *pindexBestHeader = nullptr;
-CWaitableCriticalSection csBestBlock;
-CConditionVariable cvBlockChange;
-uint256 hashBestBlock;
+CWaitableCriticalSection g_best_block_mutex;
+CConditionVariable g_best_block_cv;
+uint256 g_best_block;
int nScriptCheckThreads = 0;
std::atomic_bool fImporting(false);
std::atomic_bool fReindex(false);
@@ -2197,9 +2197,9 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar
mempool.AddTransactionsUpdated(1);
{
- WaitableLock lock(csBestBlock);
- hashBestBlock = pindexNew->GetBlockHash();
- cvBlockChange.notify_all();
+ WaitableLock lock(g_best_block_mutex);
+ g_best_block = pindexNew->GetBlockHash();
+ g_best_block_cv.notify_all();
}
std::vector<std::string> warningMessages;