aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorw0xlt <94266259+w0xlt@users.noreply.github.com>2022-01-19 14:43:15 -0300
committerw0xlt <94266259+w0xlt@users.noreply.github.com>2022-01-19 14:43:15 -0300
commit1dfd31bc267c54144a7e62ad5a1a5860c032f4d7 (patch)
treea021c155784df1c1a08e51b6a1658e6da1e35aa4 /src
parent887796a5ffcbafcd281b920f8d55fcb6e8347584 (diff)
downloadbitcoin-1dfd31bc267c54144a7e62ad5a1a5860c032f4d7.tar.xz
scripted-diff: rename m_cs_chainstate -> m_chainstate_mutex
-BEGIN VERIFY SCRIPT- s() { sed -i 's/m_cs_chainstate/m_chainstate_mutex/g' $1; } s src/validation.cpp s src/validation.h -END VERIFY SCRIPT-
Diffstat (limited to 'src')
-rw-r--r--src/validation.cpp6
-rw-r--r--src/validation.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/validation.cpp b/src/validation.cpp
index c521e9b634..7c0654c2c6 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -2830,8 +2830,8 @@ bool CChainState::ActivateBestChain(BlockValidationState& state, std::shared_ptr
// ABC maintains a fair degree of expensive-to-calculate internal state
// because this function periodically releases cs_main so that it does not lock up other threads for too long
// during large connects - and to allow for e.g. the callback queue to drain
- // we use m_cs_chainstate to enforce mutual exclusion so that only one caller may execute this function at a time
- LOCK(m_cs_chainstate);
+ // we use m_chainstate_mutex to enforce mutual exclusion so that only one caller may execute this function at a time
+ LOCK(m_chainstate_mutex);
CBlockIndex *pindexMostWork = nullptr;
CBlockIndex *pindexNewTip = nullptr;
@@ -2961,7 +2961,7 @@ bool CChainState::InvalidateBlock(BlockValidationState& state, CBlockIndex* pind
// We do not allow ActivateBestChain() to run while InvalidateBlock() is
// running, as that could cause the tip to change while we disconnect
// blocks.
- LOCK(m_cs_chainstate);
+ LOCK(m_chainstate_mutex);
// We'll be acquiring and releasing cs_main below, to allow the validation
// callbacks to run. However, we should keep the block index in a
diff --git a/src/validation.h b/src/validation.h
index 160fffd048..ae3749bb47 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -536,7 +536,7 @@ protected:
* the ChainState CriticalSection
* A lock that must be held when modifying this ChainState - held in ActivateBestChain()
*/
- RecursiveMutex m_cs_chainstate;
+ RecursiveMutex m_chainstate_mutex;
/**
* Whether this chainstate is undergoing initial block download.