diff options
| author | Pieter Wuille <[email protected]> | 2018-04-03 21:53:07 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2018-04-03 21:53:27 -0700 |
| commit | 4a6c0e3dcfdca98270cb96b73db4c3d4446dba50 (patch) | |
| tree | 144d60525f085531ef71883d6d3a25f680d405db /src/validation.cpp | |
| parent | Fix csBestBlock/cvBlockChange waiting in rpc/mining (diff) | |
| download | discoin-4a6c0e3dcfdca98270cb96b73db4c3d4446dba50.tar.xz discoin-4a6c0e3dcfdca98270cb96b73db4c3d4446dba50.zip | |
Modernize best block mutex/cv/hash variable naming
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index c3e411f1f..9dda65923 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; |